QtPlatformSupport: A helper library for platform plugins

QtPlatformSupport is a static library. Platform plugins are meant to
link against this library to pull in dependencies such as fontengines
and convenience functions for finding the right GL configs. The linker
will only pull in the symbols used, so the size of the library doesn't
really matter

configure

@@ -6293,6 +6293,11 @@ if [ "$PLATFORM_QPA" = "yes" ]; then
         QMAKE_LIBDIR_WAYLAND=`$PKG_CONFIG --variable=libdir wayland-client 2>/dev/null`
     fi
 
+    # Check we actually have X11 :-)
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
+        QT_CONFIG="$QT_CONFIG xlib"
+    fi
+
     # Detect libxkbcommon
     if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists xkbcommon 2>/dev/null; then
         QMAKE_CFLAGS_XKBCOMMON="`$PKG_CONFIG --cflags xkbcommon 2>/dev/null`"

mkspecs/features/qpa/basicunixfontdatabase.prf

@@ -0,0 +1,3 @@
+contains(QT_CONFIG, system-freetype) {
+    LIBS += -lfreetype
+}

mkspecs/features/qpa/dnd/simple.prf

@@ -1,5 +0,0 @@
-load(qpa/platforms_dir)
-INCLUDEPATH += $$QT_PLATFORMS_DIR/dnd
-HEADERS += $$QT_PLATFORMS_DIR/dnd/qsimpledrag.h
-SOURCES += $$QT_PLATFORMS_DIR/dnd/qsimpledrag.cpp
-QT += gui-private

mkspecs/features/qpa/egl/context.prf

@@ -1,9 +0,0 @@
-load(qpa/platforms_dir)
-
-INCLUDEPATH += $$QT_PLATFORMS_DIR/eglconvenience
-
-SOURCES += \
-    $$QT_PLATFORMS_DIR/eglconvenience/qeglplatformcontext.cpp
-
-HEADERS += \
-    $$QT_PLATFORMS_DIR/eglconvenience/qeglplatformcontext.h

mkspecs/features/qpa/egl/convenience.prf

@@ -1,9 +0,0 @@
-load(qpa/platforms_dir)
-
-INCLUDEPATH += $$QT_PLATFORMS_DIR/eglconvenience
-
-SOURCES += \
-    $$QT_PLATFORMS_DIR/eglconvenience/qeglconvenience.cpp
-
-HEADERS += \
-    $$QT_PLATFORMS_DIR/eglconvenience/qeglconvenience.h

mkspecs/features/qpa/egl/xlibintegration.prf

@@ -1,9 +0,0 @@
-load(qpa/platforms_dir)
-
-INCLUDEPATH += $$QT_PLATFORMS_DIR/eglconvenience
-
-HEADERS += \
-    $$QT_PLATFORMS_DIR/eglconvenience/qxlibeglintegration.h
-
-SOURCES += \
-    $$QT_PLATFORMS_DIR/eglconvenience/qxlibeglintegration.cpp

mkspecs/features/qpa/fontdatabases/fontconfig.prf

@@ -1,12 +0,0 @@
-load(qpa/fontdatabases/basicunix)
-
-HEADERS += \
-        $$QT_PLATFORMS_DIR/fontdatabases/fontconfig/qfontconfigdatabase.h
-
-SOURCES += \
-        $$QT_PLATFORMS_DIR/fontdatabases/fontconfig/qfontconfigdatabase.cpp
-
-INCLUDEPATH += $$QT_PLATFORMS_DIR/fontdatabases/fontconfig
-LIBS_PRIVATE += -lfontconfig
-
-

mkspecs/features/qpa/fontdatabases/genericunix.prf

@@ -1,9 +0,0 @@
-contains(QT_CONFIG, fontconfig) {
-    load(qpa/fontdatabases/fontconfig)
-    DEFINES += Q_FONTCONFIGDATABASE
-} else {
-    load(qpa/fontdatabases/basicunix.prf)
-}
-
-INCLUDEPATH += $$QT_PLATFORMS_DIR/fontdatabases/genericunix
-HEADERS += $$QT_PLATFORMS_DIR/fontdatabases/genericunix/qgenericunixfontdatabase.h

mkspecs/features/qpa/fontengine_dir.prf

@@ -1,9 +0,0 @@
-load(qpa/platforms_dir)
-
-QT_FONTENGINE_DIR = ""
-
-isEmpty(QT_SOURCE_TREE) {
-    QT_FONTENGINE_DIR = $$QT_PLATFORMS_DIR/fontdatabases/fontengines
-} else {
-    QT_FONTENGINE_DIR = $$QT_SOURCE_TREE/src/gui/text
-}

mkspecs/features/qpa/freetype_dir.prf

@@ -1,8 +0,0 @@
-load(qpa/platforms_dir)
-
-QT_FREETYPE_DIR = ""
-isEmpty(QT_SOURCE_TREE) {
-    QT_FREETYPE_DIR = $$QT_PLATFORMS_DIR/fontdatabases/freetype
-} else {
-    QT_FREETYPE_DIR = $$QT_SOURCE_TREE/src/3rdparty/freetype
-}

mkspecs/features/qpa/genericunixfontdatabase.prf

@@ -0,0 +1,5 @@
+CONFIG += qpa/basicunixfontdatabase
+contains(QT_CONFIG, fontconfig) {
+    DEFINES += Q_FONTCONFIGDATABASE
+    LIBS += -lfontconfig
+}

mkspecs/features/qpa/glx/convenience.prf

@@ -1,16 +0,0 @@
-load(qpa/platforms_dir)
-INCLUDEPATH += $$QT_PLATFORMS_DIR/glxconvenience
-
-HEADERS += \
-    $$QT_PLATFORMS_DIR/glxconvenience/qglxconvenience.h
-
-SOURCES += \
-    $$QT_PLATFORMS_DIR/glxconvenience/qglxconvenience.cpp
-
-CONFIG += xrender
-
-xrender {
-	LIBS += -lXrender
-} else {
-	DEFINES += QT_NO_XRENDER
-}

mkspecs/features/qpa/harfbuzz_dir.prf

@@ -1,9 +0,0 @@
-load(qpa/platforms_dir)
-
-QT_HARFBUZZ_DIR = ""
-isEmpty(QT_SOURCE_TREE) {
-    QT_HARFBUZZ_DIR = $$QT_PLATFORMS_DIR/fontdatabases/harfbuzz
-} else {
-    QT_HARFBUZZ_DIR = $$QT_SOURCE_TREE/src/3rdparty/harfbuzz
-}
-

mkspecs/features/qpa/platforms_dir.prf

@@ -1,7 +0,0 @@
-QT_PLATFORMS_DIR = ""
-
-isEmpty(QT_SOURCE_TREE) {
-    QT_PLATFORMS_DIR = $$[QT_INSTALL_DATA]/platforms
-} else {
-    QT_PLATFORMS_DIR = $$QT_SOURCE_TREE/src/plugins/platforms
-}

mkspecs/features/qpa/plugin.prf

@@ -1,5 +0,0 @@
-TEMPLATE = lib
-
-CONFIG += qt plugin
-
-TARGET = $$qtLibraryTarget($$TARGET)

mkspecs/features/qpa/printersupport/genericunix.prf

@@ -1,6 +0,0 @@
-load(qpa/platforms_dir)
-
-INCLUDEPATH += $$QT_PLATFORMS_DIR/printersupport/genericunix
-HEADERS += $$QT_PLATFORMS_DIR/printersupport/genericunix/qgenericunixprintersupport.h
-SOURCES += $$QT_PLATFORMS_DIR/printersupport/genericunix/qgenericunixprintersupport.cpp
-QT += gui-private

mkspecs/features/qpa/printersupport/windows.prf

@@ -1,13 +0,0 @@
-load(qpa/platforms_dir)
-load(qpa/harfbuzz_dir)
-
-INCLUDEPATH += $$QT_PLATFORMS_DIR/printersupport/windows
-INCLUDEPATH += $$QT_HARFBUZZ_DIR/src
-
-HEADERS += \
-    $$QT_PLATFORMS_DIR/printersupport/windows/qwindowsprintersupport.h \
-    $$QT_PLATFORMS_DIR/printersupport/windows/qprintengine_win_p.h
-SOURCES += \
-    $$QT_PLATFORMS_DIR/printersupport/windows/qwindowsprintersupport.cpp \
-    $$QT_PLATFORMS_DIR/printersupport/windows/qprintengine_win.cpp
-QT += core-private widgets-private

src/modules/qt_platformsupport.pri

@@ -0,0 +1,14 @@
+QT.platformsupport.VERSION = 5.0.0
+QT.platformsupport.MAJOR_VERSION = 5
+QT.platformsupport.MINOR_VERSION = 0
+QT.platformsupport.PATCH_VERSION = 0
+
+QT.platformsupport.name = QtPlatformSupport
+QT.platformsupport.includes = $$QT_MODULE_INCLUDE_BASE/QtPlatformSupport
+QT.platformsupport.private_includes = $$QT_MODULE_INCLUDE_BASE/QtPlatformSupport/$$QT.platformsupport.VERSION
+QT.platformsupport.sources = $$QT_MODULE_BASE/src/platformsupport
+QT.platformsupport.libs = $$QT_MODULE_LIB_BASE
+QT.platformsupport.plugins = $$QT_MODULE_PLUGIN_BASE
+QT.platformsupport.imports = $$QT_MODULE_IMPORT_BASE
+QT.platformsupport.depends = core gui
+QT.platformsupport.DEFINES =

src/platformsupport/dnd/dnd.pri

@@ -0,0 +1,4 @@
+HEADERS += \
+    $$PWD/qsimpledrag_p.h
+SOURCES += \
+    $$PWD/qsimpledrag.cpp

src/platformsupport/dnd/qsimpledrag.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qsimpledrag.h"
+#include "qsimpledrag_p.h"
 
 #include "qbitmap.h"
 #include "qdrag.h"

src/platformsupport/eglconvenience/eglconvenience.pri

@@ -0,0 +1,15 @@
+contains(QT_CONFIG,opengles2) {
+    HEADERS += \
+        $$PWD/qeglconvenience_p.h \
+        $$PWD/qeglplatformcontext_p.h
+    SOURCES += \
+        $$PWD/qeglconvenience.cpp \
+        $$PWD/qeglplatformcontext.cpp
+
+    contains(QT_CONFIG,xlib) {
+        HEADERS += \
+            $$PWD/qxlibeglintegration_p.h
+        SOURCES += \
+            $$PWD/qxlibeglintegration.cpp
+    }
+}

src/platformsupport/eglconvenience/qeglconvenience.cpp

@@ -41,7 +41,7 @@
 
 #include <QByteArray>
 
-#include "qeglconvenience.h"
+#include "qeglconvenience_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/platformsupport/eglconvenience/qeglplatformcontext.cpp

@@ -39,13 +39,12 @@
 **
 ****************************************************************************/
 
-#include "qeglplatformcontext.h"
+#include "qeglplatformcontext_p.h"
 
+#include "qeglconvenience_p.h"
 
 #include <QtGui/QPlatformWindow>
 
-#include "qeglconvenience.h"
-
 #include <EGL/egl.h>
 
 QEGLSurface::QEGLSurface(EGLSurface surface, const QGuiGLFormat &format)

src/platformsupport/eglconvenience/qxlibeglintegration.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qxlibeglintegration.h"
+#include "qxlibeglintegration_p.h"
 
 static int countBits(unsigned long mask)
 {

src/platformsupport/eglconvenience/qxlibeglintegration_p.h

@@ -42,7 +42,7 @@
 #ifndef QTESTLITEEGLINTEGRATION_H
 #define QTESTLITEEGLINTEGRATION_H
 
-#include "qeglconvenience.h"
+#include "qeglconvenience_p.h"
 
 class QXlibEglIntegration
 {

src/platformsupport/fb_base/fb_base.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "fb_base.h"
+#include "fb_base_p.h"
 #include <qpainter.h>
 #include <qdebug.h>
 #include <qbitmap.h>

src/platformsupport/fb_base/fb_base.pri

@@ -0,0 +1,4 @@
+do_not_compile_untill_ported_to_qt5 {
+    SOURCES += $$PWD/fb_base.cpp
+    HEADERS += $$PWD/fb_base_p.h
+}

src/platformsupport/fontdatabases/basicunix/basicunix.pri

@@ -1,29 +1,22 @@
-#### Remove this define
 DEFINES += QT_NO_FONTCONFIG
-
 QT += gui-private core-private
 
-load(qpa/platforms_dir)
-load(qpa/harfbuzz_dir)
-load(qpa/freetype_dir)
-load(qpa/fontengine_dir)
-
-
 HEADERS += \
-        $$QT_PLATFORMS_DIR/fontdatabases/basicunix/qbasicunixfontdatabase.h \
+        $$PWD/qbasicunixfontdatabase_p.h \
-        $$QT_FONTENGINE_DIR/qfontengine_ft_p.h
+        $$QT_SOURCE_TREE/src/gui/text/qfontengine_ft_p.h
 
 SOURCES += \
-        $$QT_PLATFORMS_DIR/fontdatabases/basicunix/qbasicunixfontdatabase.cpp \
+        $$PWD/qbasicunixfontdatabase.cpp \
-        $$QT_FONTENGINE_DIR/qfontengine_ft.cpp
+        $$QT_SOURCE_TREE/src/gui/text/qfontengine_ft.cpp
 
-INCLUDEPATH += $$QT_HARFBUZZ_DIR/src
+INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src
 
-INCLUDEPATH += $$QT_PLATFORMS_DIR/fontdatabases/basicunix
+INCLUDEPATH += $$PWD
 
 CONFIG += opentype
 
 contains(QT_CONFIG, freetype) {
+    QT_FREETYPE_DIR = $$QT_SOURCE_TREE/src/3rdparty/freetype
     SOURCES += \
                $$QT_FREETYPE_DIR/src/base/ftbase.c \
                $$QT_FREETYPE_DIR/src/base/ftbbox.c \
@@ -69,37 +62,27 @@ contains(QT_CONFIG, freetype) {
                $$QT_FREETYPE_DIR/src/autofit/afloader.c\
                $$QT_FREETYPE_DIR/src/autofit/autofit.c
 
-               symbian {
+   symbian {
-                   SOURCES += \
+       SOURCES += \
-                              $$QT_FREETYPE_DIR/src/base/ftsystem.c
+                  $$QT_FREETYPE_DIR/src/base/ftsystem.c
-               } else {
+   } else {
-                   SOURCES += \
+       SOURCES += \
-                              $$QT_FREETYPE_DIR/builds/unix/ftsystem.c
+                  $$QT_FREETYPE_DIR/builds/unix/ftsystem.c
-                  INCLUDEPATH += \
+      INCLUDEPATH += \
-                              $$QT_FREETYPE_DIR/builds/unix
+                  $$QT_FREETYPE_DIR/builds/unix
-               }
+   }
 
-               INCLUDEPATH += \
+   INCLUDEPATH += \
-                   $$QT_FREETYPE_DIR/src \
+       $$QT_FREETYPE_DIR/src \
-                   $$QT_FREETYPE_DIR/include
+       $$QT_FREETYPE_DIR/include
 
-               DEFINES += FT2_BUILD_LIBRARY
+   DEFINES += FT2_BUILD_LIBRARY
-               contains(QT_CONFIG, system-zlib) {
+   contains(QT_CONFIG, system-zlib) {
-                    DEFINES += FT_CONFIG_OPTION_SYSTEM_ZLIB
+        DEFINES += FT_CONFIG_OPTION_SYSTEM_ZLIB
-               }
+   }
 
-    } else:contains(QT_CONFIG, system-freetype) {
+} else:contains(QT_CONFIG, system-freetype) {
-        # pull in the proper freetype2 include directory
+    # pull in the proper freetype2 include directory
-        #include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri)
+    include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri)
-        !cross_compile {
+}
-            TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
-            # LSB doesn't allow using headers from /include or /usr/include
-            linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
-            for(p, TRY_INCLUDEPATHS) {
-                p = $$join(p, "", "", "/freetype2")
-                exists($$p):INCLUDEPATH *= $$p
-            }
-        }
-        LIBS_PRIVATE += -lfreetype
-    }
 

src/platformsupport/fontdatabases/basicunix/qbasicunixfontdatabase.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qbasicunixfontdatabase.h"
+#include "qbasicunixfontdatabase_p.h"
 
 #include <QtGui/private/qguiapplication_p.h>
 #include <QtGui/QPlatformScreen>
@@ -312,12 +312,12 @@ QStringList QBasicUnixFontDatabase::addTTFile(const QByteArray &fontData, const
 
         QString family = QString::fromAscii(face->family_name);
         FontFile *fontFile = new FontFile;
-        fontFile->fileName = file;
+        fontFile->fileName = QString::fromAscii(file);
         fontFile->indexValue = index;
 
         QFont::Stretch stretch = QFont::Unstretched;
 
-        registerFont(family,"",weight,style,stretch,true,true,0,writingSystems,fontFile);
+        registerFont(family,QString(),weight,style,stretch,true,true,0,writingSystems,fontFile);
 
         families.append(family);
 

src/platformsupport/fontdatabases/fontconfig/fontconfig.pri

@@ -0,0 +1,2 @@
+HEADERS += $$PWD/qfontconfigdatabase_p.h
+SOURCES += $$PWD/qfontconfigdatabase.cpp

src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qfontconfigdatabase.h"
+#include "qfontconfigdatabase_p.h"
 
 #include <QtCore/QList>
 #include <QtGui/private/qfont_p.h>
@@ -446,10 +446,11 @@ void QFontconfigDatabase::populateFontDatabase()
     ws.setSupported(QFontDatabase::Latin);
 
 
+    QString familyQtName = QString::fromLatin1(f->qtname);
     while (f->qtname) {
-        registerFont(f->qtname,QLatin1String(""),QFont::Normal,QFont::StyleNormal,QFont::Unstretched,true,true,0,ws,0);
+        registerFont(familyQtName,QString(),QFont::Normal,QFont::StyleNormal,QFont::Unstretched,true,true,0,ws,0);
-        registerFont(f->qtname,QLatin1String(""),QFont::Normal,QFont::StyleItalic,QFont::Unstretched,true,true,0,ws,0);
+        registerFont(familyQtName,QString(),QFont::Normal,QFont::StyleItalic,QFont::Unstretched,true,true,0,ws,0);
-        registerFont(f->qtname,QLatin1String(""),QFont::Normal,QFont::StyleOblique,QFont::Unstretched,true,true,0,ws,0);
+        registerFont(familyQtName,QString(),QFont::Normal,QFont::StyleOblique,QFont::Unstretched,true,true,0,ws,0);
         ++f;
     }
 

src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase_p.h

@@ -43,7 +43,7 @@
 #define QFONTCONFIGDATABASE_H
 
 #include <QPlatformFontDatabase>
-#include "qbasicunixfontdatabase.h"
+#include <QtPlatformSupport/private/qbasicunixfontdatabase_p.h>
 
 class QFontconfigDatabase : public QBasicUnixFontDatabase
 {

src/platformsupport/fontdatabases/fontdatabases.pri

@@ -0,0 +1,7 @@
+unix {
+    include($$PWD/basicunix/basicunix.pri)
+    include($$PWD/genericunix/genericunix.pri)
+    contains(QT_CONFIG,fontconfig) {
+        include($$PWD/fontconfig/fontconfig.pri)
+    }
+}

src/platformsupport/fontdatabases/genericunix/genericunix.pri

@@ -0,0 +1 @@
+HEADERS += $$PWD/qgenericunixfontdatabase_p.h

src/platformsupport/fontdatabases/genericunix/qgenericunixfontdatabase_p.h

@@ -43,10 +43,10 @@
 #define QGENERICUNIXFONTDATABASE_H
 
 #ifdef Q_FONTCONFIGDATABASE
-#include "qfontconfigdatabase.h"
+#include "QtPlatformSupport/private/qfontconfigdatabase_p.h"
 typedef QFontconfigDatabase QGenericUnixFontDatabase;
 #else
-#include "qbasicunixfontdatabase.h"
+#include "QtPlatformSupport/private/qbasicunixfontdatabase_p.h"
 typedef QBasicUnixFontDatabase QGenericUnixFontDatabase;
 #endif //Q_FONTCONFIGDATABASE
 

src/platformsupport/glxconvenience/glxconvenience.pri

@@ -0,0 +1,6 @@
+contains(QT_CONFIG,xlib) {
+    contains(QT_CONFIG,opengl):!contains(QT_CONFIG,opengles2) {
+        HEADERS += $$PWD/qglxconvenience_p.h
+        SOURCES += $$PWD/qglxconvenience.cpp
+    }
+}

src/platformsupport/glxconvenience/qglxconvenience.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qglxconvenience.h"
+#include "qglxconvenience_p.h"
 
 #include <QtCore/QVector>
 

src/platformsupport/platformsupport.pro

@@ -0,0 +1,23 @@
+TARGET	   = QtPlatformSupport
+QPRO_PWD   = $$PWD
+QT         += core-private gui-private
+
+CONFIG += module staticlib
+MODULE_PRI = ../modules/qt_platformssupport.pri
+
+unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui
+
+include(../qbase.pri)
+
+HEADERS += $$QT_SOURCE_TREE/src/platforms_libs/qtplatformslibsversion.h
+
+DEFINES += QT_NO_CAST_FROM_ASCII
+PRECOMPILED_HEADER = ../corelib/global/qt_pch.h
+
+include(dnd/dnd.pri)
+include(eglconvenience/eglconvenience.pri)
+include(fb_base/fb_base.pri)
+include(fontdatabases/fontdatabases.pri)
+include(glxconvenience/glxconvenience.pri)
+include(printersupport/printersupport.pri)
+

src/platformsupport/printersupport/genericunix/genericunix.pri

@@ -0,0 +1,2 @@
+HEADERS += $$PWD/qgenericunixprintersupport_p.h
+SOURCES += $$PWD/qgenericunixprintersupport.cpp

src/platformsupport/printersupport/genericunix/qgenericunixprintersupport.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <qgenericunixprintersupport.h>
+#include "qgenericunixprintersupport_p.h"
 
 #include <QtGui/QPrinterInfo>
 #include <private/qcups_p.h>

src/platformsupport/printersupport/printersupport.pri

@@ -0,0 +1,7 @@
+unix {
+    include($$PWD/genericunix/genericunix.pri)
+}
+
+win {
+    include($$PWD/windows/windows.pri)
+}

src/platformsupport/printersupport/windows/qwindowsprintersupport.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <qwindowsprintersupport.h>
+#include <qwindowsprintersupport_p.h>
 #include <qprintengine_win_p.h>
 
 #include <QtGui/QPrinterInfo>

src/platformsupport/printersupport/windows/windows.pri

@@ -0,0 +1,2 @@
+HEADERS += $$PWD/qwindowsprintersupport_p.h
+SOURCES += $$PWD/qwindowsprintersupport.cpp

src/plugins/platforms/cocoa/cocoa.pro

@@ -1,5 +1,5 @@
 TARGET = qcocoa
-load(qpa/plugin)
+load(qt_plugin)
 DESTDIR = $$QT.gui.plugins/platforms
 
 OBJECTIVE_SOURCES = main.mm \
@@ -28,8 +28,8 @@ DEFINES += QT_BUILD_COCOA_LIB
 LIBS += -lz
 LIBS += -framework cocoa
 
-QT += core-private gui-private
+QT += core-private gui-private platformsupport-private
 
-load(qpa/fontdatabases/basicunix)
+CONFIG += qpa/basicunixfontdatabase
 target.path += $$[QT_INSTALL_PLUGINS]/platforms
 INSTALLS += target

src/plugins/platforms/fb_base/fb_base.pri

@@ -1,2 +0,0 @@
-SOURCES += ../fb_base/fb_base.cpp
-HEADERS += ../fb_base/fb_base.h

src/plugins/platforms/fb_base/fb_base.pro

@@ -1,23 +0,0 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2009-11-05T13:22:31
-#
-#-------------------------------------------------
-
-#QT       -= core gui
-TARGET = fb_base
-#load(qt_plugin)
-
-DESTDIR = $$QT.gui.plugins/graphicssystems
-
-TEMPLATE = lib
-
-#DEFINES += STATIC_LIBRARY
-CONFIG += staticlib
-
-SOURCES += fb_base.cpp
-
-HEADERS += fb_base.h
-
-target.path += $$[QT_INSTALL_PLUGINS]/graphicssystems
-INSTALLS += target

src/plugins/platforms/minimal/minimal.pro

@@ -1,5 +1,5 @@
 TARGET = qminimal
-load(qpa/plugin)
+load(qt_plugin)
 
 QT = core-private gui-private
 DESTDIR = $$QT.gui.plugins/platforms

src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp

@@ -46,7 +46,7 @@
 #include <QtCore/QDebug>
 #include <QtGui/QRegion>
 
-#include "qeglconvenience.h"
+#include "QtPlatformSupport/private/qeglconvenience_p.h"
 
 QWaylandXCompositeEGLSurface::QWaylandXCompositeEGLSurface(QWaylandXCompositeEGLWindow *window)
     : QEGLSurface(window->eglSurface(), window->window()->glFormat())

src/plugins/platforms/wayland/qwaylandintegration.cpp

@@ -47,7 +47,7 @@
 #include "qwaylandnativeinterface.h"
 #include "qwaylandclipboard.h"
 
-#include "qgenericunixfontdatabase.h"
+#include "QtPlatformSupport/private/qgenericunixfontdatabase_p.h"
 
 #include <QtGui/QWindowSystemInterface>
 #include <QtGui/QPlatformCursor>

src/plugins/platforms/wayland/wayland.pro

@@ -1,14 +1,14 @@
 TARGET = qwayland
-load(qpa/plugin)
+load(qt_plugin)
 
-QT+=gui-private core-private opengl-private
+CONFIG += qpa/genericunixfontdatabase
 
 DESTDIR = $$QT.gui.plugins/platforms
 
 DEFINES += Q_PLATFORM_WAYLAND
 DEFINES += $$QMAKE_DEFINES_WAYLAND
 
-QT += core-private gui-private opengl-private
+QT += core-private gui-private opengl-private platformsupport-private
 
 SOURCES =   main.cpp \
             qwaylandintegration.cpp \
@@ -37,19 +37,6 @@ INCLUDEPATH += $$QMAKE_INCDIR_WAYLAND
 LIBS += $$QMAKE_LIBS_WAYLAND
 QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_WAYLAND
 
-INCLUDEPATH += $$PWD
-
-QT += gui-private
-QT += opengl-private
-QT += core-private
-QT += widgets-private
-
-include ($$PWD/gl_integration/gl_integration.pri)
-
-include ($$PWD/windowmanager_integration/windowmanager_integration.pri)
-
-load(qpa/fontdatabases/genericunix)
-
 target.path += $$[QT_INSTALL_PLUGINS]/platforms
 INSTALLS += target
 

src/plugins/platforms/xcb/qxcbintegration.cpp

@@ -49,13 +49,13 @@
 #include "qxcbdrag.h"
 #include "qxcbimage.h"
 
-#include <qgenericunixprintersupport.h>
+#include <QtPlatformSupport/private/qgenericunixprintersupport_p.h>
 
 #include <xcb/xcb.h>
 
 #include <private/qpixmap_raster_p.h>
 
-#include "qgenericunixfontdatabase.h"
+#include <QtPlatformSupport/private/qgenericunixfontdatabase_p.h>
 
 #include <stdio.h>
 

src/plugins/platforms/xcb/qxcbnativeinterface.cpp

@@ -51,7 +51,7 @@
 #include <QtGui/qguiglcontext_qpa.h>
 
 #if defined(XCB_USE_EGL)
-#include "../eglconvenience/qeglplatformcontext.h"
+#include "QtPlatformSupport/private/qeglplatformcontext_p.h"
 #elif defined (XCB_USE_DRI2)
 #include "qdri2context.h"
 #endif

src/plugins/platforms/xcb/qxcbwindow.cpp

@@ -68,12 +68,12 @@
 #endif
 
 #if defined(XCB_USE_GLX)
-#include "qglxintegration.h"
+#include <QtPlatformSupport/private/glxintegration_p.h>
-#include "qglxconvenience.h"
+#include <QtPlatformSupport/private/glxconvenience_p.h>
 #elif defined(XCB_USE_EGL)
-#include "../eglconvenience/qeglplatformcontext.h"
+#include <QtPlatformSupport/private/qeglplatformcontext_p.h>
-#include "../eglconvenience/qeglconvenience.h"
+#include <QtPlatformSupport/private/qeglconvenience_p.h>
-#include "../eglconvenience/qxlibeglintegration.h"
+#include <QtPlatformSupport/private/qxlibeglintegration_p.h>
 #endif
 
 #define XCOORD_MAX 16383

src/plugins/platforms/xcb/xcb.pro

@@ -1,9 +1,9 @@
 TARGET = xcb
 
-load(qpa/plugin)
+load(qt_plugin)
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms
 
-QT += core-private gui-private
+QT += core-private gui-private platformsupport-private
 
 SOURCES = \
         qxcbclipboard.cpp \
@@ -61,14 +61,9 @@ contains(QT_CONFIG, opengl) {
     } else {
         contains(QT_CONFIG, opengles2) {
             DEFINES += XCB_USE_EGL
-            load(qpa/egl/convenience)
-            load(qpa/egl/context)
-            load(qpa/egl/xlibintegration)
-
             LIBS += -lEGL
         } else {
             DEFINES += XCB_USE_GLX
-            load(qpa/glx/convenience)
             HEADERS += qglxintegration.h
             SOURCES += qglxintegration.cpp
         }
@@ -83,8 +78,7 @@ DEFINES += $$QMAKE_DEFINES_XCB
 LIBS += $$QMAKE_LIBS_XCB
 QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XCB
 
-load(qpa/fontdatabases/genericunix)
+CONFIG += qpa/genericunixfontdatabase
-load(qpa/printersupport/genericunix)
 
 target.path += $$[QT_INSTALL_PLUGINS]/platforms
 INSTALLS += target

src/src.pro

@@ -10,7 +10,7 @@ SRC_SUBDIRS += src_corelib
 !cross_compile {
     win32:!wince*: SRC_SUBDIRS += src_tools_idc
 }
-SRC_SUBDIRS += src_network src_sql src_gui src_xml src_uitools src_widgets src_testlib
+SRC_SUBDIRS += src_network src_sql src_gui src_xml src_uitools src_widgets src_testlib src_platformsupport
 nacl: SRC_SUBDIRS -= src_network src_testlib
 !symbian:contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus
 contains(QT_CONFIG, no-gui): SRC_SUBDIRS -= src_gui
@@ -50,6 +50,9 @@ src_widgets.subdir = $$QT_SOURCE_TREE/src/widgets
 src_widgets.target = sub-widgets
 src_testlib.subdir = $$QT_SOURCE_TREE/src/testlib
 src_testlib.target = sub-testlib
+src_platformsupport.subdir = $$QT_SOURCE_TREE/src/platformsupport
+src_platformsupport.target = sub-platformsupport
+
 
 #CONFIG += ordered
 !wince*:!ordered:!symbian-abld:!symbian-sbsv2 {
@@ -66,6 +69,7 @@ src_testlib.target = sub-testlib
    src_testlib.depends = src_corelib src_gui src_widgets
    src_tools_idc.depends = src_corelib             # target defined in tools.pro
    src_plugins.depends = src_gui src_sql src_xml
+   qpa: src_plugins.depends = src_platformsupport
    src_s60installs.depends = $$TOOLS_SUBDIRS $$SRC_SUBDIRS
    src_s60installs.depends -= src_s60installs
    contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2) {

sync.profile

@@ -10,6 +10,7 @@
     "QtDBus" => "$basedir/src/dbus",
     "QtUiTools" => "$basedir/src/uitools",
     "QtDesigner" => "$basedir/tools/uilib",
+    "QtPlatformSupport" => "$basedir/src/platformsupport",
 );
 %moduleheaders = ( # restrict the module headers to those found in relative path
 );
@@ -60,6 +61,7 @@
     "QtXml" => "$basedir/src/modules/qt_xml.pri",
     "QtUiTools" => "$basedir/src/modules/qt_uitools.pri",
     "QtDesigner" => "$basedir/src/modules/qt_uilib.pri",
+    "QtPlatformSupport" => "$basedir/src/modules/qt_platformsupport.pri",
 );
 
 @ignore_for_master_contents = ( "qt.h", "qpaintdevicedefs.h" );
@@ -109,4 +111,8 @@
         "QtGui" => "THIS_REPOSITORY",
         "QtWidgets" => "THIS_REPOSITORY",
     },
+    "QtPlatformSupport" => {
+        "QtCore" => "THIS_REPOSITORY",
+        "QtGui" => "THIS_REPOSITORY",
+    },
 );