mirror of https://github.com/qt/qtbase.git
fix LD_LIBRARY_PATH setup of check targets
amends 4c34b418
Change-Id: Id9d214fe936d947aaea4a56fd724ad50381032e1
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
parent
1b00363b2f
commit
b6f8557af8
|
@ -236,13 +236,10 @@ defineTest(qtAddToolEnv) {
|
||||||
|
|
||||||
defineTest(qtAddTargetEnv) {
|
defineTest(qtAddTargetEnv) {
|
||||||
deps = $$replace(QT, -private$, )
|
deps = $$replace(QT, -private$, )
|
||||||
deps = $$resolve_depends(deps, "QT.")
|
deps = $$resolve_depends(deps, "QT.", ".depends" ".private_depends" ".run_depends")
|
||||||
!isEmpty(deps) {
|
!isEmpty(deps) {
|
||||||
for(dep, deps) {
|
for(dep, deps): \
|
||||||
deppath += $$shell_path($$eval(QT.$${dep}.libs))
|
deppath += $$shell_path($$eval(QT.$${dep}.libs))
|
||||||
for(rpath, QT.$${dep}.rpath_link): \
|
|
||||||
deppath += $$shell_path($$rpath)
|
|
||||||
}
|
|
||||||
equals(QMAKE_HOST.os, Windows) {
|
equals(QMAKE_HOST.os, Windows) {
|
||||||
deppath.name = PATH
|
deppath.name = PATH
|
||||||
} else:contains(QMAKE_HOST.os, Linux|FreeBSD) {
|
} else:contains(QMAKE_HOST.os, Linux|FreeBSD) {
|
||||||
|
|
Loading…
Reference in New Issue