diff options
| author | Prasanth Ullattil <prasanth.ullattil@nokia.com> | 2011-01-25 14:48:39 +0100 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-04-27 12:05:55 +0200 |
| commit | b88c6fbcfe1108ae31c8773daeb51c9596e29a62 (patch) | |
| tree | d16614792790a3244aceed31ffa5fa13cc5ae845 /mkspecs | |
| parent | 61126f4ae6fe9c5a664e79339de1483605a4074e (diff) | |
Use the MODULE_LIBS instead of QMAKE_LIBDIR_QT for frameworks.
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index c44419c4f2..b16c84864f 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -106,7 +106,7 @@ defineTest(qtAddModule) { unset(LINKAGE) mac { CONFIG(qt_framework, qt_framework|qt_no_framework) { #forced - QMAKE_FRAMEWORKPATH *= $${QMAKE_LIBDIR_QT} + QMAKE_FRAMEWORKPATH *= $${MODULE_LIBS} FRAMEWORK_INCLUDE = $$MODULE_INCLUDES.framework/Headers !qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE) { INCLUDEPATH -= $$FRAMEWORK_INCLUDE @@ -114,7 +114,7 @@ defineTest(qtAddModule) { } LINKAGE = -framework $${MODULE_NAME}$${QT_LIBINFIX} } else:!qt_no_framework { #detection - for(frmwrk_dir, $$list($$QMAKE_LIBDIR_QT $$QMAKE_LIBDIR $$(DYLD_FRAMEWORK_PATH) /Library/Frameworks)) { + for(frmwrk_dir, $$list($$MODULE_LIBS $$QMAKE_LIBDIR $$(DYLD_FRAMEWORK_PATH) /Library/Frameworks)) { exists($${frmwrk_dir}/$${MODULE_NAME}.framework) { QMAKE_FRAMEWORKPATH *= $${frmwrk_dir} FRAMEWORK_INCLUDE = $$frmwrk_dir/$${MODULE_NAME}.framework/Headers |