Mac: make platformsupport a static lib

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>

diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index 13dadeb..cb04f94 100644 (file)
--- 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]) {

diff --git a/src/platformsupport/cglconvenience/cglconvenience_p.h b/src/platformsupport/cglconvenience/cglconvenience_p.h
index f7426b4..96433b6 100644 (file)
--- a/src/platformsupport/cglconvenience/cglconvenience_p.h
+++ b/src/platformsupport/cglconvenience/cglconvenience_p.h
@@ -46,9 +46,9 @@
 #include <QString>
 #include <OpenGL/OpenGL.h>
 
-Q_GUI_EXPORT void (*qcgl_getProcAddress(const QByteArray &procName))();
-Q_GUI_EXPORT QSurfaceFormat qcgl_surfaceFormat();
-Q_GUI_EXPORT void *qcgl_createNSOpenGLPixelFormat();
-Q_GUI_EXPORT CGLContextObj qcgl_createGlContext();
+void (*qcgl_getProcAddress(const QByteArray &procName))();
+QSurfaceFormat qcgl_surfaceFormat();
+void *qcgl_createNSOpenGLPixelFormat();
+CGLContextObj qcgl_createGlContext();
 
 #endif // QMACGLCONVENIENCE_H

diff --git a/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h b/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h
index 690d81a..0d9f5b7 100644 (file)
--- a/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h
+++ b/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h
@@ -40,8 +40,4 @@
 ****************************************************************************/
 
 class QAbstractEventDispatcher;
-#ifdef Q_OS_MAC
-Q_GUI_EXPORT QAbstractEventDispatcher* createUnixEventDispatcher();
-#else
 QAbstractEventDispatcher* createUnixEventDispatcher();
-#endif

diff --git a/src/platformsupport/fontdatabases/basicunix/qbasicunixfontdatabase_p.h b/src/platformsupport/fontdatabases/basicunix/qbasicunixfontdatabase_p.h
index 13c931f..fa5fce0 100644 (file)
--- a/src/platformsupport/fontdatabases/basicunix/qbasicunixfontdatabase_p.h
+++ b/src/platformsupport/fontdatabases/basicunix/qbasicunixfontdatabase_p.h
@@ -52,11 +52,7 @@ struct FontFile
     int indexValue;
 };
 
-#ifdef Q_OS_MAC
-class Q_GUI_EXPORT QBasicUnixFontDatabase : public QPlatformFontDatabase
-#else
 class QBasicUnixFontDatabase : public QPlatformFontDatabase
-#endif
 {
 public:
     void populateFontDatabase();

diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro
index f5e62ef..126cff8 100644 (file)
--- a/src/platformsupport/platformsupport.pro
+++ b/src/platformsupport/platformsupport.pro
@@ -6,7 +6,7 @@ TEMPLATE   = lib
 DESTDIR    = $$QMAKE_LIBDIR_QT
 
 CONFIG += module
-!mac:CONFIG += staticlib
+CONFIG += staticlib
 mac:LIBS += -lz -framework CoreFoundation -framework Carbon
 
 MODULE_PRI = ../modules/qt_platformsupport.pri