diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-21 15:26:18 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-21 15:26:18 +0100 |
| commit | fb9cff6e88699b57b5dbc05d79c7958a2deacd71 (patch) | |
| tree | b0dbd28d8c36eabf4eab750e68ac2e7cf886e1e5 /mkspecs/features/qt_functions.prf | |
| parent | da2f627ba2117b6ef1791ff8971df2fc68c29d10 (diff) | |
| parent | 2ab9b747fcc5aa50e8cca758f7780158e734a222 (diff) | |
Merge "Merge remote-tracking branch 'gerrit/release' into stable" into refs/staging/stable
Diffstat (limited to 'mkspecs/features/qt_functions.prf')
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 478c255836..8cd2473224 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -236,13 +236,10 @@ defineTest(qtAddToolEnv) { defineTest(qtAddTargetEnv) { deps = $$replace(QT, -private$, ) - deps = $$resolve_depends(deps, "QT.") + deps = $$resolve_depends(deps, "QT.", ".depends" ".private_depends" ".run_depends") !isEmpty(deps) { - for(dep, deps) { + for(dep, deps): \ deppath += $$shell_path($$eval(QT.$${dep}.libs)) - for(rpath, QT.$${dep}.rpath_link): \ - deppath += $$shell_path($$rpath) - } equals(QMAKE_HOST.os, Windows) { deppath.name = PATH } else:contains(QMAKE_HOST.os, Linux|FreeBSD) { |