diff options
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 17 | ||||
| -rw-r--r-- | src/modules/qt_platformsupport.pri | 1 |
2 files changed, 15 insertions, 3 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index cb04f94120..09b1b8a34b 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -96,6 +96,7 @@ defineTest(qtAddModule) { MODULE_NAME = $$eval(QT.$${1}.name) MODULE_INCLUDES = $$eval(QT.$${1}.includes) MODULE_LIBS = $$eval(QT.$${1}.libs) + MODULE_CONFIG = $$eval(QT.$${1}.module_config) CONFIG += $$eval(QT.$${1}.CONFIG) DEFINES += $$eval(QT.$${1}.DEFINES) @@ -115,8 +116,17 @@ defineTest(qtAddModule) { unset(LINKAGE) mac { - for(frmwrk_dir, $$list($$MODULE_LIBS $$QMAKE_LIBDIR $$(DYLD_FRAMEWORK_PATH) /Library/Frameworks)) { - exists($${frmwrk_dir}/$${MODULE_NAME}.framework) { + !contains(MODULE_CONFIG,staticlib):CONFIG(qt_framework, qt_framework|qt_no_framework) { #forced + QMAKE_FRAMEWORKPATH *= $${MODULE_LIBS} + FRAMEWORK_INCLUDE = $$MODULE_INCLUDES.framework/Headers + !qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE) { + INCLUDEPATH -= $$FRAMEWORK_INCLUDE + INCLUDEPATH = $$FRAMEWORK_INCLUDE $$INCLUDEPATH + } + LINKAGE = -framework $${MODULE_NAME}$${QT_LIBINFIX} + } else:!qt_no_framework { #detection + 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 !qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE) { @@ -125,7 +135,8 @@ defineTest(qtAddModule) { } LINKAGE = -framework $${MODULE_NAME} break() - } + } + } } } diff --git a/src/modules/qt_platformsupport.pri b/src/modules/qt_platformsupport.pri index 152f69b3e9..6671cc0584 100644 --- a/src/modules/qt_platformsupport.pri +++ b/src/modules/qt_platformsupport.pri @@ -12,4 +12,5 @@ QT.platformsupport.libs = $$QT_MODULE_LIB_BASE QT.platformsupport.plugins = $$QT_MODULE_PLUGIN_BASE QT.platformsupport.imports = $$QT_MODULE_IMPORT_BASE QT.platformsupport.depends = core gui +QT.platformsupport.module_config = staticlib QT.platformsupport.DEFINES = |