From ceed409b40fd5b8fe5c62ac33144e66f50b28ede Mon Sep 17 00:00:00 2001
From: Morten Sorvig <morten.sorvig@nokia.com>
Date: Wed, 24 Aug 2011 09:47:20 +0200
Subject: Mac: make platformsupport a static lib
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The "force framework/no-framework" logic does not
really work, since Qt is now a mix of frameworks
and statics libs. Remove this code path and use
the "detection" path instead.

Also remove the exports from platformsupport.

Change-Id: I0a308666480445eb47c4f443ff7529addecad10d
Reviewed-on: http://codereview.qt.nokia.com/3464
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
---
 mkspecs/features/qt_functions.prf | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

(limited to 'mkspecs')

diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index 13dadeb1e9..cb04f94120 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -115,29 +115,20 @@ defineTest(qtAddModule) {
 
     unset(LINKAGE)
     mac {
-       CONFIG(qt_framework, qt_framework|qt_no_framework) { #forced
-          QMAKE_FRAMEWORKPATH *= $${MODULE_LIBS}
-          FRAMEWORK_INCLUDE = $$MODULE_INCLUDES.framework/Headers
-          !qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE) {
-             INCLUDEPATH -= $$FRAMEWORK_INCLUDE
-             INCLUDEPATH = $$FRAMEWORK_INCLUDE $$INCLUDEPATH
-           }
-           LINKAGE = -framework $${MODULE_NAME}$${QT_LIBINFIX}
-        } else:!qt_no_framework { #detection
-           for(frmwrk_dir, $$list($$MODULE_LIBS $$QMAKE_LIBDIR $$(DYLD_FRAMEWORK_PATH) /Library/Frameworks)) {
-              exists($${frmwrk_dir}/$${MODULE_NAME}.framework) {
+        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
                 !qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE) {
-                  INCLUDEPATH -= $$FRAMEWORK_INCLUDE
-                  INCLUDEPATH = $$FRAMEWORK_INCLUDE $$INCLUDEPATH
+                    INCLUDEPATH -= $$FRAMEWORK_INCLUDE
+                    INCLUDEPATH = $$FRAMEWORK_INCLUDE $$INCLUDEPATH
                 }
                 LINKAGE = -framework $${MODULE_NAME}
                 break()
-              }
-           }
-       }
+            }
+        }
     }
+
     isEmpty(LINKAGE) {
        # Make sure we can link to uninstalled libraries
        !isEqual(MODULE_LIBS, $$[QT_INSTALL_LIBS]) {
-- 
cgit v1.2.3