Use the MODULE_LIBS instead of QMAKE_LIBDIR_QT for frameworks.
This commit is contained in:
parent
61126f4ae6
commit
b88c6fbcfe
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user