Fix FRAMEWORK_INCLUDE for Mac
On Mac the framework include paths were generated wrong. The $${MODULE_NAME} was missing. This patch fixes the framework include path generation. Change-Id: Ic0e8d69ac7ac63be755302dc822c28240c9bc3d2 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
parent
10c6f015f4
commit
400813f585
@ -65,7 +65,7 @@ defineTest(qtAddModule) {
|
||||
mac {
|
||||
!contains(MODULE_CONFIG,staticlib):CONFIG(qt_framework, qt_framework|qt_no_framework) { #forced
|
||||
QMAKE_FRAMEWORKPATH *= $${MODULE_LIBS}
|
||||
FRAMEWORK_INCLUDE = $${MODULE_LIBS}.framework/Headers
|
||||
FRAMEWORK_INCLUDE = $${MODULE_LIBS}/$${MODULE_NAME}.framework/Headers
|
||||
!qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE): \
|
||||
INCLUDEPATH *= $$FRAMEWORK_INCLUDE
|
||||
LINKAGE = -framework $${MODULE_NAME}$${QT_LIBINFIX}
|
||||
|
Loading…
Reference in New Issue
Block a user