Fix FRAMEWORK_INCLUDE for Mac
authorIikka Eklund <iikka.eklund@digia.com>
Thu, 5 Jul 2012 04:14:22 +0000 (07:14 +0300)
committerQt by Nokia <qt-info@nokia.com>
Thu, 5 Jul 2012 11:13:58 +0000 (13:13 +0200)
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>
mkspecs/features/qt_functions.prf

index ce6d9e4..e51a3c9 100644 (file)
@@ -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}