diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-10-29 11:18:06 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-29 22:21:32 +0100 |
| commit | f05a392f3ea70d2d446bb3a0bc826ef6d60f1c3b (patch) | |
| tree | c4e083ea29e391c051095c3becaa6921cd507610 /mkspecs/features/qt_functions.prf | |
| parent | d802a0019895207e719ed9a51612735d11970887 (diff) | |
fix tool invocation for -prefix + -framework builds on macx
set DYLD_FRAMEWORK_PATH instead of DYLD_LIBRARY_PATH
Change-Id: I9849f12063b8c7a45d040c087f4611c3a48180b8
Reviewed-by: Johanna Äijälä <johanna.aijala@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'mkspecs/features/qt_functions.prf')
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index f8922e68ef..ce32028138 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -215,14 +215,18 @@ defineTest(qtAddTargetEnv) { for(rpath, QT.$${dep}.rpath_link): \ deppath += $$shell_path($$rpath) } - equals(QMAKE_HOST.os, Windows): \ + equals(QMAKE_HOST.os, Windows) { deppath.name = PATH - else:contains(QMAKE_HOST.os, Linux|FreeBSD): \ + } else:contains(QMAKE_HOST.os, Linux|FreeBSD) { deppath.name = LD_LIBRARY_PATH - else:equals(QMAKE_HOST.os, Darwin): \ - deppath.name = DYLD_LIBRARY_PATH - else: \ + } else:equals(QMAKE_HOST.os, Darwin) { + contains(QT_CONFIG, qt_framework): \ + deppath.name = DYLD_FRAMEWORK_PATH + else: \ + deppath.name = DYLD_LIBRARY_PATH + } else { error("Operating system not supported.") + } deppath.value = $$unique(deppath) deppath.CONFIG = prepend |