diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-29 12:58:32 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-29 12:58:41 +0200 |
| commit | e66d181e659a08d19ab7d144c3ba0619d537de83 (patch) | |
| tree | 7367e93797cb9a2a331f0741baed5a1cad2c96b6 /mkspecs/features/qt_functions.prf | |
| parent | 4758555f3e44af3425f0b691dc38fb40f3c9413d (diff) | |
| parent | 75aea3ff5eec4a5c8f4184e14a90f4a5e3a577b0 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I3b51bb706e401edfda09a433c67aa58e44f33e83
Diffstat (limited to 'mkspecs/features/qt_functions.prf')
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index b1cfcd7499..0f43af10ed 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -185,8 +185,10 @@ defineTest(qtAddTargetEnv) { deps = $$replace($$2, -private$, _private) deps = $$resolve_depends(deps, "QT.", ".depends" ".run_depends") !isEmpty(deps) { + libs = libs deppath.CONFIG = prepend equals(QMAKE_HOST.os, Windows) { + libs = bins deppath.CONFIG = always_prepend deppath.name = PATH } else:contains(QMAKE_HOST.os, Linux|FreeBSD|OpenBSD|NetBSD|DragonFly|SunOS|HP-UX|QNX|GNU) { @@ -206,9 +208,9 @@ defineTest(qtAddTargetEnv) { ptypes = for(dep, deps) { isEmpty(3): \ - deppath += $$shell_path($$eval(QT.$${dep}.libs)) + deppath += $$shell_path($$eval(QT.$${dep}.$$libs)) else: \ - deppath += $$system_path($$eval(QT.$${dep}.libs)) + deppath += $$system_path($$eval(QT.$${dep}.$$libs)) ptypes += $$eval(QT.$${dep}.plugin_types) } deppath.value = $$unique(deppath) |