diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-11-20 19:04:11 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-11-26 17:03:39 +0000 |
| commit | 9b2e98245a95bec9179edf648d7b562d2d1cb692 (patch) | |
| tree | c12a28a98552a0f97096a78dc325d6b564a78e4a | |
| parent | 94fb31be984513d24b00eff3badc3b13c93fb10f (diff) | |
use bindir instead of libdir when launching tools on windows
longer term, the redundant .dlls from the libdir will hopefully
disappear. short term, this is a workaround for CI brokenness.
Change-Id: Ia30173355f3aca222d4ca40e7a38c2cf535bbc03
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 403b847ac1..00f4bdf93e 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -120,15 +120,9 @@ defineTest(qtAddTargetEnv) { deps = $$replace($$2, -private$, _private) deps = $$resolve_depends(deps, "QT.", ".depends" ".run_depends") !isEmpty(deps) { - ptypes = - for(dep, deps) { - isEmpty(3): \ - deppath += $$shell_path($$eval(QT.$${dep}.libs)) - else: \ - deppath += $$system_path($$eval(QT.$${dep}.libs)) - ptypes += $$eval(QT.$${dep}.plugin_types) - } + libs = libs equals(QMAKE_HOST.os, Windows) { + libs = bins deppath.name = PATH } else:contains(QMAKE_HOST.os, Linux|FreeBSD|OpenBSD|NetBSD|DragonFly|SunOS|HP-UX|QNX|GNU) { deppath.name = LD_LIBRARY_PATH @@ -144,6 +138,14 @@ defineTest(qtAddTargetEnv) { } else { error("Operating system not supported.") } + ptypes = + for(dep, deps) { + isEmpty(3): \ + deppath += $$shell_path($$eval(QT.$${dep}.$$libs)) + else: \ + deppath += $$system_path($$eval(QT.$${dep}.$$libs)) + ptypes += $$eval(QT.$${dep}.plugin_types) + } deppath.value = $$unique(deppath) deppath.CONFIG = prepend |