1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mac: make platformsupport a static lib

Browse Source 
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>
This commit is contained in:
Morten Sorvig 2011-08-24 09:47:20 +02:00 committed by Morten Johan Sørvig
parent 82e715b277
commit ceed409b40
5 changed files with 12 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mkspecs/features/qt_functions.prf
View File

@ -115,15 +115,6 @@ defineTest(qtAddModule) {
unset(LINKAGE) unset(LINKAGE)
mac { 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)) { for(frmwrk_dir, $$list($$MODULE_LIBS $$QMAKE_LIBDIR $$(DYLD_FRAMEWORK_PATH) /Library/Frameworks)) {
exists($${frmwrk_dir}/$${MODULE_NAME}.framework) { exists($${frmwrk_dir}/$${MODULE_NAME}.framework) {
QMAKE_FRAMEWORKPATH *= $${frmwrk_dir} QMAKE_FRAMEWORKPATH *= $${frmwrk_dir}
@ -137,7 +128,7 @@ defineTest(qtAddModule) {
} }
} }
} }
}
isEmpty(LINKAGE) { isEmpty(LINKAGE) {
# Make sure we can link to uninstalled libraries # Make sure we can link to uninstalled libraries
!isEqual(MODULE_LIBS, $$[QT_INSTALL_LIBS]) { !isEqual(MODULE_LIBS, $$[QT_INSTALL_LIBS]) {

8
src/platformsupport/cglconvenience/cglconvenience_p.h
View File

@ -46,9 +46,9 @@
#include <QString> #include <QString>
#include <OpenGL/OpenGL.h> #include <OpenGL/OpenGL.h>
Q_GUI_EXPORT void (*qcgl_getProcAddress(const QByteArray &procName))(); void (*qcgl_getProcAddress(const QByteArray &procName))();
Q_GUI_EXPORT QSurfaceFormat qcgl_surfaceFormat(); QSurfaceFormat qcgl_surfaceFormat();
Q_GUI_EXPORT void *qcgl_createNSOpenGLPixelFormat(); void *qcgl_createNSOpenGLPixelFormat();
Q_GUI_EXPORT CGLContextObj qcgl_createGlContext(); CGLContextObj qcgl_createGlContext();
#endif // QMACGLCONVENIENCE_H #endif // QMACGLCONVENIENCE_H

4
src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h
View File

@ -40,8 +40,4 @@
****************************************************************************/ ****************************************************************************/
class QAbstractEventDispatcher; class QAbstractEventDispatcher;
#ifdef Q_OS_MAC
Q_GUI_EXPORT QAbstractEventDispatcher* createUnixEventDispatcher();
#else
QAbstractEventDispatcher* createUnixEventDispatcher(); QAbstractEventDispatcher* createUnixEventDispatcher();
#endif

4
src/platformsupport/fontdatabases/basicunix/qbasicunixfontdatabase_p.h
View File

@ -52,11 +52,7 @@ struct FontFile
int indexValue; int indexValue;
}; };
#ifdef Q_OS_MAC
class Q_GUI_EXPORT QBasicUnixFontDatabase : public QPlatformFontDatabase
#else
class QBasicUnixFontDatabase : public QPlatformFontDatabase class QBasicUnixFontDatabase : public QPlatformFontDatabase
#endif
{ {
public: public:
void populateFontDatabase(); void populateFontDatabase();

2
src/platformsupport/platformsupport.pro
View File

@ -6,7 +6,7 @@ TEMPLATE = lib
DESTDIR = $$QMAKE_LIBDIR_QT DESTDIR = $$QMAKE_LIBDIR_QT
CONFIG += module CONFIG += module
!mac:CONFIG += staticlib CONFIG += staticlib
mac:LIBS += -lz -framework CoreFoundation -framework Carbon mac:LIBS += -lz -framework CoreFoundation -framework Carbon
MODULE_PRI = ../modules/qt_platformsupport.pri MODULE_PRI = ../modules/qt_platformsupport.pri