fix direct includes from modules which are frameworks
Change-Id: I1f2c1e5ebdb2fa258500a08b32dcafb4150ee424 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
parent
5cea63d2f2
commit
a0374fd490
@ -65,7 +65,7 @@ defineTest(qtAddModule) {
|
|||||||
mac {
|
mac {
|
||||||
!contains(MODULE_CONFIG,staticlib):CONFIG(qt_framework, qt_framework|qt_no_framework) { #forced
|
!contains(MODULE_CONFIG,staticlib):CONFIG(qt_framework, qt_framework|qt_no_framework) { #forced
|
||||||
QMAKE_FRAMEWORKPATH *= $${MODULE_LIBS}
|
QMAKE_FRAMEWORKPATH *= $${MODULE_LIBS}
|
||||||
FRAMEWORK_INCLUDE = $$MODULE_INCLUDES.framework/Headers
|
FRAMEWORK_INCLUDE = $${MODULE_LIBS}.framework/Headers
|
||||||
!qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE): \
|
!qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE): \
|
||||||
INCLUDEPATH *= $$FRAMEWORK_INCLUDE
|
INCLUDEPATH *= $$FRAMEWORK_INCLUDE
|
||||||
LINKAGE = -framework $${MODULE_NAME}$${QT_LIBINFIX}
|
LINKAGE = -framework $${MODULE_NAME}$${QT_LIBINFIX}
|
||||||
|
Loading…
Reference in New Issue
Block a user