From 400813f58599efff4dfea8de7eae7e598873bab1 Mon Sep 17 00:00:00 2001
From: Iikka Eklund <iikka.eklund@digia.com>
Date: Thu, 5 Jul 2012 07:14:22 +0300
Subject: 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>
---
 mkspecs/features/qt_functions.prf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index ce6d9e414b..e51a3c953e 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -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}
-- 
cgit v1.2.3