Expose QPA API under qpa/*

The main reasons for doing this are:
1. _qpa.h end up in the master QtGui include file. QtGui is meant for
userland applications. qpa code is neither binary nor source compatible.
Inadvertant use of QPA api makes the user code binary-incompatible.
2. syncqt creates forwarding headers for non-private header files. This
gives people the impression that this is public API.

As discussed on the mailing list, even though QPA api is internal and subject
to change, it needs to  treated differently from private headers since they
will be used by  in-qtbase and out-of-qtbase plugins.

This commit does the following:
1. The _qpa in QPA header files is dropped.
2. syncqt now treats any file with qplatform prefix as a special file and
moves it to qpa/ directory. The recommended way of using QPA API in plugins
is: #include <qpa/qplatformfoo.h>. This allows the user include QPA API
from multiple modules (for example, qplatformfoo might be in QtPrintSupport)
3. The user needs to explicitly add QT += <module>-private to get access to
the qpa api.
4. Creates compat headers for the olden style qplatformfoo_qpa.h and QPlatformFoo
includes.

This commit does not change the cpp filenames. This requires a more careful
merging of existing non qpa cpp files and existing cpp files on a case by
case basis. This can be done at anytime.

The following files are not renamed as part of this changed but will be fixed
as part of a future change:
src/gui/kernel/qgenericpluginfactory_qpa.h
src/gui/kernel/qgenericplugin_qpa.h
src/gui/kernel/qwindowsysteminterface_qpa.h

files were renamed using

    for x in `find . -name "qplatform*_qpa.h"`; do git mv $x "${x/_qpa.h/.h}"; done
    for x in `find . -name "qplatform*_qpa_p.h"`; do git mv $x "${x/_qpa_p.h/_p.h}"; done

includes were renamed using script

for file in `find . -name "*.h" -or -name "*.cpp" -or -name "*.mm"`; do
    sed -i -e 's,.*#.*include.*<\(Qt.*/\)\?\(QPlatform.*\)>,#include <qpa/\L\2.h>,g' \
        -e 's,.*#.*include.*"\(Qt.*/\)\?\(QPlatform.*\)",#include <qpa/\L\2.h>,g' \
        -e 's,.*#.*include.* "\(qplatform.*\)_qpa.h",#include <qpa/\L\1.h>,g' \
        -e 's,.*#.*include.*"\(qplatform.*\)_qpa_p.h",#include <qpa/\L\1_p.h>,g' \
        -e 's,.*#.*include.*<\(Qt.*/\|Qt.*/private/\|private/\)\?\(qplatform.*\)_qpa\(.*\)>,#include <qpa/\2\3>,g' \
        -e 's,.*#.*include.*"\(Qt.*/\|Qt.*/private/\|private/\)\?\(qplatform.*\)_qpa\(.*\)",#include <qpa/\2\3>,g' \
        $file
done

Change-Id: I04a350314a45746e3911f54b3b21ad03315afb67
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>

bin/syncqt

@@ -992,7 +992,11 @@ foreach my $lib (@modules_to_sync) {
                         my $header_copies = 0;
                         #figure out if it is a public header
                         my $public_header = $header;
-                        if($allheadersprivate || $public_header =~ /_p.h$/ || $public_header =~ /_pch.h$/) {
+                        my $qpa_header = 0;
+                        if($public_header =~ /^qplatform/) {
+                            $public_header = 0;
+                            $qpa_header = 1;
+                        } elsif($allheadersprivate || $public_header =~ /_p.h$/ || $public_header =~ /_pch.h$/) {
                             $public_header = 0;
                         } else {
                             foreach (@ignore_for_master_contents) {
@@ -1040,13 +1044,20 @@ foreach my $lib (@modules_to_sync) {
                                     $header_copies++ if(syncHeader($lib, "$out_basedir/include/$lib/$explicitheaders{$lib}{basename($header)}", "$out_basedir/include/$lib/$header", 0, $ts));
                                 }
 
-                            } elsif ($create_private_headers) {
+                            } elsif ($create_private_headers && !$qpa_header) {
                                 if ($module_version) {
                                     @headers = ( "$out_basedir/include/$lib/$module_version/$lib/private/$header" );
                                 } else {
                                     @headers = ( "$out_basedir/include/$lib/private/$header" );
                                 }
+                            } elsif ($create_private_headers) {
+                                if ($module_version) {
+                                    @headers = ( "$out_basedir/include/$lib/$module_version/$lib/qpa/$header" );
+                                } else {
+                                    @headers = ( "$out_basedir/include/$lib/qpa/$header" );
+                                }
                             }
+
                             foreach(@headers) { #sync them
                                 $header_copies++ if(syncHeader($lib, $_, $iheader, $copy_headers && !$shadow, $ts));
                             }
@@ -1317,6 +1328,8 @@ if($check_includes) {
                         my $public_header = $header;
                         if($public_header =~ /_p.h$/ || $public_header =~ /_pch.h$/) {
                             $public_header = 0;
+                        } elsif ($public_header =~ /^qplatform/) {
+                            $public_header = 0;
                         } else {
                             foreach (@ignore_for_master_contents) {
                                 $public_header = 0 if($header eq $_);

examples/opengl/hellowindow/main.cpp

@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 #include <QGuiApplication>
-#include <QPlatformIntegration>
+#include <qpa/qplatformintegration.h>
 #include <private/qguiapplication_p.h>
 #include <QScreen>
 #include <QThread>

src/gui/accessible/accessible.pri

@@ -6,7 +6,7 @@ contains(QT_CONFIG, accessibility) {
         accessible/qaccessible2.h \
         accessible/qaccessibleobject.h \
         accessible/qaccessibleplugin.h \
-        accessible/qplatformaccessibility_qpa.h
+        accessible/qplatformaccessibility.h
 
     SOURCES += accessible/qaccessible.cpp \
         accessible/qaccessible2.cpp \

src/gui/accessible/qaccessible.cpp

@@ -48,8 +48,8 @@
 #include "qaccessiblebridge.h"
 #include <QtGui/QGuiApplication>
 #include <private/qguiapplication_p.h>
-#include "qplatformaccessibility_qpa.h"
-#include "qplatformintegration_qpa.h"
+#include <qpa/qplatformaccessibility.h>
+#include <qpa/qplatformintegration.h>
 
 #include <QtCore/qdebug.h>
 #include <QtCore/qmetaobject.h>

src/gui/accessible/qplatformaccessibility_qpa.cpp

@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "qplatformaccessibility_qpa.h"
+#include "qplatformaccessibility.h"
 #include <private/qfactoryloader_p.h>
 #include "qaccessibleplugin.h"
 #include "qaccessibleobject.h"

src/gui/image/image.pri

@@ -21,7 +21,7 @@ HEADERS += \
         image/qpixmap_blitter_p.h \
         image/qpixmapcache.h \
         image/qpixmapcache_p.h \
-        image/qplatformpixmap_qpa.h \
+        image/qplatformpixmap.h \
         image/qimagepixmapcleanuphooks_p.h \
 
 SOURCES += \

src/gui/image/qbitmap.cpp

@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 #include "qbitmap.h"
-#include "qplatformpixmap_qpa.h"
-#include "qplatformintegration_qpa.h"
+#include <qpa/qplatformpixmap.h>
+#include <qpa/qplatformintegration.h>
 #include "qimage.h"
 #include "qscreen.h"
 #include "qvariant.h"

src/gui/image/qimage.cpp

@@ -50,13 +50,13 @@
 #include "qstringlist.h"
 #include "qvariant.h"
 #include "qimagepixmapcleanuphooks_p.h"
-#include "qplatformintegration_qpa.h"
+#include <qpa/qplatformintegration.h>
 #include <private/qguiapplication_p.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <limits.h>
 #include <math.h>
-#include <qplatformpixmap_qpa.h>
+#include <qpa/qplatformpixmap.h>
 #include <private/qdrawhelper_p.h>
 #include <private/qmemrotate_p.h>
 #include <private/qimagescale_p.h>

src/gui/image/qimagepixmapcleanuphooks.cpp

@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qimagepixmapcleanuphooks_p.h"
-#include "qplatformpixmap_qpa.h"
+#include <qpa/qplatformpixmap.h>
 #include "private/qimage_p.h"
 
 

src/gui/image/qnativeimage.cpp

@@ -41,7 +41,7 @@
 
 #include <qdebug.h>
 #include "qnativeimage_p.h"
-#include "qplatformscreen_qpa.h"
+#include <qpa/qplatformscreen.h>
 #include "private/qguiapplication_p.h"
 #include "qscreen.h"
 

src/gui/image/qpixmap.cpp

@@ -42,7 +42,7 @@
 #include <qglobal.h>
 
 #include "qpixmap.h"
-#include "qplatformpixmap_qpa.h"
+#include <qpa/qplatformpixmap.h>
 #include "qimagepixmapcleanuphooks_p.h"
 
 #include "qbitmap.h"
@@ -63,7 +63,7 @@
 #include "qthread.h"
 #include "qdebug.h"
 
-# include "qplatformintegration_qpa.h"
+#include <qpa/qplatformintegration.h>
 
 #include "qpixmap_raster_p.h"
 #include "private/qhexstring_p.h"

src/gui/image/qpixmap_blitter_p.h

@@ -42,7 +42,7 @@
 #ifndef QPIXMAP_BLITTER_P_H
 #define QPIXMAP_BLITTER_P_H
 
-#include <qplatformpixmap_qpa.h>
+#include <qpa/qplatformpixmap.h>
 #include <private/qpaintengine_blitter_p.h>
 
 #ifndef QT_NO_BLITTABLE

src/gui/image/qpixmap_raster_p.h

@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <QtGui/qplatformpixmap_qpa.h>
+#include <qpa/qplatformpixmap.h>
 
 
 QT_BEGIN_NAMESPACE

src/gui/image/qpixmap_win.cpp

@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qpixmap.h"
-#include "qplatformpixmap_qpa.h"
+#include <qpa/qplatformpixmap.h>
 #include "qpixmap_raster_p.h"
 
 #include <qglobal.h>

src/gui/image/qplatformpixmap.cpp

@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qplatformpixmap_qpa.h"
-#include "qplatformintegration_qpa.h"
+#include "qplatformpixmap.h"
+#include <qpa/qplatformintegration.h>
 #include <QtCore/qbuffer.h>
 #include <QtGui/qbitmap.h>
 #include <QtGui/qimagereader.h>

src/gui/kernel/kernel.pri

@@ -10,27 +10,27 @@ HEADERS += \
         kernel/qgenericplugin_qpa.h \
         kernel/qwindowsysteminterface_qpa.h \
         kernel/qwindowsysteminterface_qpa_p.h \
-        kernel/qplatformintegration_qpa.h \
-        kernel/qplatformdrag_qpa.h \
-        kernel/qplatformscreen_qpa.h \
-        kernel/qplatformscreen_qpa_p.h \
-        kernel/qplatforminputcontext_qpa.h \
-        kernel/qplatforminputcontext_qpa_p.h \
-        kernel/qplatformintegrationfactory_qpa_p.h \
-        kernel/qplatformintegrationplugin_qpa.h \
-        kernel/qplatformtheme_qpa.h\
-        kernel/qplatformthemefactory_qpa_p.h \
-        kernel/qplatformthemeplugin_qpa.h \
-        kernel/qplatformwindow_qpa.h \
-        kernel/qplatformcursor_qpa.h \
-        kernel/qplatformclipboard_qpa.h \
-        kernel/qplatformnativeinterface_qpa.h \
+        kernel/qplatformintegration.h \
+        kernel/qplatformdrag.h \
+        kernel/qplatformscreen.h \
+        kernel/qplatformscreen_p.h \
+        kernel/qplatforminputcontext.h \
+        kernel/qplatforminputcontext_p.h \
+        kernel/qplatformintegrationfactory_p.h \
+        kernel/qplatformintegrationplugin.h \
+        kernel/qplatformtheme.h\
+        kernel/qplatformthemefactory_p.h \
+        kernel/qplatformthemeplugin.h \
+        kernel/qplatformwindow.h \
+        kernel/qplatformcursor.h \
+        kernel/qplatformclipboard.h \
+        kernel/qplatformnativeinterface.h \
         kernel/qsurfaceformat.h \
         kernel/qguiapplication.h \
         kernel/qguiapplication_p.h \
         kernel/qwindow_p.h \
         kernel/qwindow.h \
-        kernel/qplatformsurface_qpa.h \
+        kernel/qplatformsurface.h \
         kernel/qsurface.h \
         kernel/qclipboard.h \
         kernel/qcursor.h \
@@ -55,10 +55,10 @@ HEADERS += \
         kernel/qstylehints.h \
         kernel/qtouchdevice.h \
         kernel/qtouchdevice_p.h \
-        kernel/qplatformsharedgraphicscache_qpa.h \
-        kernel/qplatformdialoghelper_qpa.h \
-        kernel/qplatformservices_qpa.h \
-        kernel/qplatformscreenpageflipper_qpa.h
+        kernel/qplatformsharedgraphicscache.h \
+        kernel/qplatformdialoghelper.h \
+        kernel/qplatformservices.h \
+        kernel/qplatformscreenpageflipper.h
 
 SOURCES += \
         kernel/qclipboard_qpa.cpp \
@@ -107,7 +107,7 @@ SOURCES += \
 
 contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) {
     HEADERS += \
-            kernel/qplatformopenglcontext_qpa.h \
+            kernel/qplatformopenglcontext.h \
             kernel/qopenglcontext.h \
             kernel/qopenglcontext_p.h
 

src/gui/kernel/qclipboard_qpa.cpp

@@ -45,8 +45,8 @@
 
 #include "qmimedata.h"
 #include "private/qguiapplication_p.h"
-#include "qplatformclipboard_qpa.h"
-#include "qplatformintegration_qpa.h"
+#include <qpa/qplatformclipboard.h>
+#include <qpa/qplatformintegration.h>
 
 QT_BEGIN_NAMESPACE
 

src/gui/kernel/qcursor_qpa.cpp

@@ -42,7 +42,7 @@
 #include <qcursor.h>
 #include <qscreen.h>
 #include <private/qcursor_p.h>
-#include <qplatformcursor_qpa.h>
+#include <qpa/qplatformcursor.h>
 #include <private/qguiapplication_p.h>
 #include <qbitmap.h>
 

src/gui/kernel/qdnd.cpp

@@ -59,8 +59,8 @@
 #include "qimagewriter.h"
 #include "qdebug.h"
 #include <ctype.h>
-#include <qplatformintegration_qpa.h>
-#include <qplatformdrag_qpa.h>
+#include <qpa/qplatformintegration.h>
+#include <qpa/qplatformdrag.h>
 
 #include <private/qguiapplication_p.h>
 

src/gui/kernel/qguiapplication.cpp

@@ -42,14 +42,14 @@
 #include "qguiapplication.h"
 
 #include "private/qguiapplication_p.h"
-#include "private/qplatformintegrationfactory_qpa_p.h"
+#include <qpa/qplatformintegrationfactory_p.h>
 #include "private/qevent_p.h"
 #include "qfont.h"
-#include "qplatformfontdatabase_qpa.h"
-#include "qplatformwindow_qpa.h"
-#include "qplatformnativeinterface_qpa.h"
-#include "qplatformtheme_qpa.h"
-#include "qplatformintegration_qpa.h"
+#include <qpa/qplatformfontdatabase.h>
+#include <qpa/qplatformwindow.h>
+#include <qpa/qplatformnativeinterface.h>
+#include <qpa/qplatformtheme.h>
+#include <qpa/qplatformintegration.h>
 
 #include <QtCore/QAbstractEventDispatcher>
 #include <QtCore/QVariant>
@@ -64,14 +64,14 @@
 #include <private/qscreen_p.h>
 #include <private/qdrawhelper_p.h>
 
-#include <QtGui/QPlatformIntegration>
+#include <qpa/qplatformintegration.h>
 #include <QtGui/QGenericPluginFactory>
 #include <QtGui/qstylehints.h>
 #include <QtGui/qinputpanel.h>
 #include <QtGui/qpixmapcache.h>
-#include <QtGui/qplatformtheme_qpa.h>
-#include <QtGui/qplatforminputcontext_qpa.h>
-#include <private/qplatforminputcontext_qpa_p.h>
+#include <qpa/qplatformtheme.h>
+#include <qpa/qplatforminputcontext.h>
+#include <qpa/qplatforminputcontext_p.h>
 
 #include <QWindowSystemInterface>
 #include "private/qwindowsysteminterface_qpa_p.h"
@@ -79,11 +79,11 @@
 #include "private/qcursor_p.h"
 
 #include "private/qdnd_p.h"
-#include <private/qplatformthemefactory_qpa_p.h>
-#include "qplatformdrag_qpa.h"
+#include <qpa/qplatformthemefactory_p.h>
+#include <qpa/qplatformdrag.h>
 
 #ifndef QT_NO_CURSOR
-#include "qplatformcursor_qpa.h"
+#include <qpa/qplatformcursor.h>
 #endif
 
 #include <QtGui/QPixmap>

src/gui/kernel/qguiapplication_p.h

@@ -53,7 +53,7 @@
 #include "private/qwindowsysteminterface_qpa_p.h"
 #include "private/qshortcutmap_p.h"
 
-#include "qplatformdrag_qpa.h"
+#include <qpa/qplatformdrag.h>
 
 QT_BEGIN_HEADER
 

src/gui/kernel/qinputmethod.cpp

@@ -43,7 +43,7 @@
 #include <private/qinputmethod_p.h>
 #include <qguiapplication.h>
 #include <qtimer.h>
-#include <private/qplatforminputcontext_qpa_p.h>
+#include <qpa/qplatforminputcontext_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/gui/kernel/qinputmethod_p.h

@@ -46,8 +46,8 @@
 #include <private/qobject_p.h>
 #include <QtCore/QWeakPointer>
 #include <QTransform>
-#include <qplatforminputcontext_qpa.h>
-#include <qplatformintegration_qpa.h>
+#include <qpa/qplatforminputcontext.h>
+#include <qpa/qplatformintegration.h>
 #include <private/qguiapplication_p.h>
 
 QT_BEGIN_HEADER

src/gui/kernel/qkeysequence.cpp

@@ -41,7 +41,7 @@
 
 #include "qkeysequence.h"
 #include "qkeysequence_p.h"
-#include "qplatformtheme_qpa.h"
+#include <qpa/qplatformtheme.h>
 #include "private/qguiapplication_p.h"
 
 #ifndef QT_NO_SHORTCUT

src/gui/kernel/qopenglcontext.cpp

@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qplatformopenglcontext_qpa.h"
-#include "qplatformintegration_qpa.h"
+#include <qpa/qplatformopenglcontext.h>
+#include <qpa/qplatformintegration.h>
 #include "qopenglcontext.h"
 #include "qopenglcontext_p.h"
 #include "qwindow.h"

src/gui/kernel/qplatformclipboard_qpa.cpp

@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "qplatformclipboard_qpa.h"
+#include "qplatformclipboard.h"
 
 #ifndef QT_NO_CLIPBOARD
 

src/gui/kernel/qplatformcursor.h

@@ -57,7 +57,7 @@
 #include <QtGui/QMouseEvent>
 #include <QtCore/QWeakPointer>
 #include <QtCore/QObject>
-#include <QtGui/QPlatformScreen>
+#include <qpa/qplatformscreen.h>
 #include <QtGui/QCursor>
 
 QT_BEGIN_HEADER

src/gui/kernel/qplatformcursor_qpa.cpp

@@ -38,13 +38,13 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "qplatformcursor_qpa.h"
+#include "qplatformcursor.h"
 
 #include <QPainter>
 #include <QBitmap>
 #include <QGuiApplication>
 #include <QScreen>
-#include <QPlatformScreen>
+#include <qpa/qplatformscreen.h>
 #include <private/qguiapplication_p.h>
 
 #include <QDebug>

src/gui/kernel/qplatformdialoghelper_qpa.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qplatformdialoghelper_qpa.h"
+#include "qplatformdialoghelper.h"
 
 #include <QtCore/QVariant>
 #include <QtCore/QSharedData>

src/gui/kernel/qplatformdrag_qpa.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qplatformdrag_qpa.h"
+#include "qplatformdrag.h"
 
 #include <QtGui/private/qdnd_p.h>
 #include <QtGui/QKeyEvent>

src/gui/kernel/qplatforminputcontext_qpa.cpp

@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#include <qplatforminputcontext_qpa.h>
+#include "qplatforminputcontext.h"
 #include <qguiapplication.h>
 #include <QRect>
 #include "private/qkeymapper_p.h"
-#include "private/qplatforminputcontext_qpa_p.h"
+#include <qpa/qplatforminputcontext_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/gui/kernel/qplatformintegration.h

@@ -54,7 +54,7 @@
 //
 
 #include <QtGui/qwindowdefs.h>
-#include <QtGui/qplatformscreen_qpa.h>
+#include <qpa/qplatformscreen.h>
 #include <QtGui/qsurfaceformat.h>
 
 QT_BEGIN_HEADER

src/gui/kernel/qplatformintegration_qpa.cpp

@@ -39,15 +39,15 @@
 **
 ****************************************************************************/
 
-#include "qplatformintegration_qpa.h"
+#include "qplatformintegration.h"
 
-#include <QtGui/QPlatformFontDatabase>
-#include <QtGui/QPlatformClipboard>
-#include <QtGui/QPlatformAccessibility>
-#include <QtGui/QPlatformTheme>
+#include <qpa/qplatformfontdatabase.h>
+#include <qpa/qplatformclipboard.h>
+#include <qpa/qplatformaccessibility.h>
+#include <qpa/qplatformtheme.h>
 #include <QtGui/private/qguiapplication_p.h>
 #include <QtGui/private/qpixmap_raster_p.h>
-#include <QtGui/private/qplatformscreen_qpa_p.h>
+#include <qpa/qplatformscreen_p.h>
 #include <private/qdnd_p.h>
 
 QT_BEGIN_NAMESPACE

src/gui/kernel/qplatformintegrationfactory_qpa.cpp

@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qplatformintegrationfactory_qpa_p.h"
-#include <QPlatformIntegrationPlugin>
+#include <qpa/qplatformintegrationfactory_p.h>
+#include <qpa/qplatformintegrationplugin.h>
 #include "private/qfactoryloader_p.h"
 #include "qmutex.h"
 

src/gui/kernel/qplatformintegrationplugin_qpa.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qplatformintegrationplugin_qpa.h"
+#include "qplatformintegrationplugin.h"
 
 QT_BEGIN_NAMESPACE
 

src/gui/kernel/qplatformnativeinterface_qpa.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qplatformnativeinterface_qpa.h"
+#include "qplatformnativeinterface.h"
 
 QT_BEGIN_NAMESPACE
 

src/gui/kernel/qplatformopenglcontext_qpa.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qplatformopenglcontext_qpa.h"
+#include "qplatformopenglcontext.h"
 
 #include <QOpenGLFunctions>
 

src/gui/kernel/qplatformscreen.h

@@ -63,7 +63,7 @@
 #include <QtGui/qcursor.h>
 #include <QtGui/qimage.h>
 #include <QtGui/qwindowdefs.h>
-#include <QtGui/qplatformpixmap_qpa.h>
+#include <qpa/qplatformpixmap.h>
 
 QT_BEGIN_HEADER
 

src/gui/kernel/qplatformscreen_qpa.cpp

@@ -39,12 +39,12 @@
 **
 ****************************************************************************/
 
-#include "qplatformscreen_qpa.h"
+#include "qplatformscreen.h"
 #include <QtGui/qguiapplication.h>
-#include <QtGui/qplatformcursor_qpa.h>
+#include <qpa/qplatformcursor.h>
 #include <QtGui/private/qguiapplication_p.h>
-#include <QtGui/private/qplatformscreen_qpa_p.h>
-#include <QtGui/qplatformintegration_qpa.h>
+#include <qpa/qplatformscreen_p.h>
+#include <qpa/qplatformintegration.h>
 #include <QtGui/qscreen.h>
 #include <QtGui/qwindow.h>
 

src/gui/kernel/qplatformscreenpageflipper_qpa.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qplatformscreenpageflipper_qpa.h"
+#include "qplatformscreenpageflipper.h"
 
 QT_BEGIN_NAMESPACE
 

src/gui/kernel/qplatformservices_qpa.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qplatformservices_qpa.h"
+#include "qplatformservices.h"
 
 #include <QtCore/QUrl>
 #include <QtCore/QString>

src/gui/kernel/qplatformsharedgraphicscache_qpa.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qplatformsharedgraphicscache_qpa.h"
+#include "qplatformsharedgraphicscache.h"
 
 QT_BEGIN_NAMESPACE
 

src/gui/kernel/qplatformsurface_qpa.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qplatformsurface_qpa.h"
+#include "qplatformsurface.h"
 
 QT_BEGIN_NAMESPACE
 

src/gui/kernel/qplatformtheme_qpa.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qplatformtheme_qpa.h"
+#include "qplatformtheme.h"
 
 #include <QtCore/QVariant>
 #include <QtCore/QStringList>

src/gui/kernel/qplatformthemefactory_qpa.cpp

@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qplatformthemefactory_qpa_p.h"
-#include <QPlatformThemePlugin>
+#include <qpa/qplatformthemefactory_p.h>
+#include <qpa/qplatformthemeplugin.h>
 #include "private/qfactoryloader_p.h"
 #include "qmutex.h"
 

src/gui/kernel/qplatformthemeplugin_qpa.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qplatformthemeplugin_qpa.h"
+#include "qplatformthemeplugin.h"
 
 QT_BEGIN_NAMESPACE
 

src/gui/kernel/qplatformwindow.h

@@ -58,8 +58,8 @@
 #include <QtCore/qstring.h>
 #include <QtGui/qwindowdefs.h>
 #include <QtGui/qwindow.h>
-#include <QtGui/qplatformopenglcontext_qpa.h>
-#include <QtGui/qplatformsurface_qpa.h>
+#include <qpa/qplatformopenglcontext.h>
+#include <qpa/qplatformsurface.h>
 
 QT_BEGIN_HEADER
 

src/gui/kernel/qplatformwindow_qpa.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qplatformwindow_qpa.h"
+#include "qplatformwindow.h"
 
 #include <QtGui/qwindowsysteminterface_qpa.h>
 #include <QtGui/qwindow.h>

src/gui/kernel/qscreen.cpp

@@ -42,7 +42,7 @@
 #include "qscreen.h"
 #include "qscreen_p.h"
 #include "qpixmap.h"
-#include "qplatformscreen_qpa.h"
+#include <qpa/qplatformscreen.h>
 
 #include <QtCore/private/qobject_p.h>
 

src/gui/kernel/qscreen_p.h

@@ -43,7 +43,7 @@
 #define QSCREEN_P_H
 
 #include <QtGui/qscreen.h>
-#include <QtGui/qplatformscreen_qpa.h>
+#include <qpa/qplatformscreen.h>
 
 #include <QtCore/private/qobject_p.h>
 

src/gui/kernel/qstylehints.cpp

@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <qstylehints.h>
-#include <qplatformintegration_qpa.h>
+#include <qpa/qplatformintegration.h>
 #include <private/qguiapplication_p.h>
 
 QT_BEGIN_NAMESPACE

src/gui/kernel/qwindow.cpp

@@ -41,11 +41,11 @@
 
 #include "qwindow.h"
 
-#include "qplatformwindow_qpa.h"
-#include "qplatformintegration_qpa.h"
+#include <qpa/qplatformwindow.h>
+#include <qpa/qplatformintegration.h>
 #include "qsurfaceformat.h"
 #ifndef QT_NO_OPENGL
-#include "qplatformopenglcontext_qpa.h"
+#include <qpa/qplatformopenglcontext.h>
 #include "qopenglcontext.h"
 #endif
 #include "qscreen.h"

src/gui/kernel/qwindow_p.h

@@ -43,7 +43,7 @@
 #define QWINDOW_P_H
 
 #include <QtGui/qwindow.h>
-#include <QtGui/qplatformwindow_qpa.h>
+#include <qpa/qplatformwindow.h>
 
 #include <QtCore/private/qobject_p.h>
 

src/gui/kernel/qwindowsysteminterface_qpa.cpp

@@ -39,13 +39,13 @@
 **
 ****************************************************************************/
 #include "qwindowsysteminterface_qpa.h"
-#include "qplatformwindow_qpa.h"
+#include <qpa/qplatformwindow.h>
 #include "qwindowsysteminterface_qpa_p.h"
 #include "private/qguiapplication_p.h"
 #include "private/qevent_p.h"
 #include "private/qtouchdevice_p.h"
 #include <QAbstractEventDispatcher>
-#include <QPlatformDrag>
+#include <qpa/qplatformdrag.h>
 #include <qdebug.h>
 
 QT_BEGIN_NAMESPACE

src/gui/opengl/qopengltexturecache.cpp

@@ -42,7 +42,7 @@
 #include "qopengltexturecache_p.h"
 #include <private/qopenglcontext_p.h>
 #include <private/qimagepixmapcleanuphooks_p.h>
-#include <qplatformpixmap_qpa.h>
+#include <qpa/qplatformpixmap.h>
 
 QT_BEGIN_NAMESPACE
 

src/gui/painting/painting.pri

@@ -33,7 +33,7 @@ HEADERS += \
         painting/qstroker_p.h \
         painting/qtextureglyphcache_p.h \
         painting/qtransform.h \
-        painting/qplatformbackingstore_qpa.h \
+        painting/qplatformbackingstore.h \
         painting/qpaintbuffer_p.h \
         painting/qpathsimplifier_p.h
 

src/gui/painting/qbackingstore.cpp

@@ -42,8 +42,8 @@
 #include <qbackingstore.h>
 #include <qwindow.h>
 #include <qpixmap.h>
-#include <qplatformbackingstore_qpa.h>
-#include <qplatformintegration_qpa.h>
+#include <qpa/qplatformbackingstore.h>
+#include <qpa/qplatformintegration.h>
 #include <qscreen.h>
 
 #include <private/qguiapplication_p.h>

src/gui/painting/qplatformbackingstore_qpa.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <qplatformbackingstore_qpa.h>
+#include "qplatformbackingstore.h"
 #include <qwindow.h>
 #include <qpixmap.h>
 #include <private/qwindow_p.h>

src/gui/text/qfont.cpp

@@ -62,7 +62,7 @@
 #include <private/qtextengine_p.h>
 #include <limits.h>
 
-#include <QtGui/qplatformscreen_qpa.h>
+#include <qpa/qplatformscreen.h>
 #include <QtGui/private/qguiapplication_p.h>
 
 #include <QtCore/QMutexLocker>

src/gui/text/qfont_qpa.cpp

@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 #include <QtGui/private/qguiapplication_p.h>
-#include <QtGui/QPlatformIntegration>
-#include <QtGui/QPlatformFontDatabase>
+#include <qpa/qplatformintegration.h>
+#include <qpa/qplatformfontdatabase.h>
 
 QT_BEGIN_NAMESPACE
 

src/gui/text/qfontdatabase.cpp

@@ -50,10 +50,10 @@
 #include "qfileinfo.h"
 #include "private/qunicodetables_p.h"
 #include "qfontengine_p.h"
-#include "qplatformintegration_qpa.h"
+#include <qpa/qplatformintegration.h>
 
 #include <QtGui/private/qguiapplication_p.h>
-#include <QtGui/qplatformfontdatabase_qpa.h>
+#include <qpa/qplatformfontdatabase.h>
 
 #include <stdlib.h>
 #include <limits.h>

src/gui/text/qfontdatabase_qpa.cpp

@@ -46,7 +46,7 @@
 #include "qplatformdefs.h"
 
 #include <QtGui/private/qguiapplication_p.h>
-#include <QtGui/qplatformfontdatabase_qpa.h>
+#include <qpa/qplatformfontdatabase.h>
 
 #include <QtCore/qmath.h>
 

src/gui/text/qfontengine_qpa.cpp

@@ -48,8 +48,8 @@
 
 #include <QtGui/private/qpaintengine_raster_p.h>
 #include <QtGui/private/qguiapplication_p.h>
-#include <QtGui/QPlatformFontDatabase>
-#include <QtGui/QPlatformIntegration>
+#include <qpa/qplatformfontdatabase.h>
+#include <qpa/qplatformintegration.h>
 
 QT_BEGIN_NAMESPACE
 

src/gui/text/qplatformfontdatabase_qpa.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qplatformfontdatabase_qpa.h"
+#include "qplatformfontdatabase.h"
 #include <QtGui/private/qfontengine_p.h>
 #include <QtGui/private/qfontengine_qpa_p.h>
 #include <QtCore/QLibraryInfo>

src/gui/text/qrawfont_qpa.cpp

@@ -44,8 +44,8 @@
 #if !defined(QT_NO_RAWFONT)
 
 #include "qrawfont_p.h"
-#include "qplatformintegration_qpa.h"
-#include <QtGui/qplatformfontdatabase_qpa.h>
+#include <qpa/qplatformintegration.h>
+#include <qpa/qplatformfontdatabase.h>
 #include <private/qguiapplication_p.h>
 
 QT_BEGIN_NAMESPACE

src/gui/text/text.pri

@@ -102,7 +102,7 @@ SOURCES += \
       text/qrawfont_qpa.cpp
 
 HEADERS += \
-      text/qplatformfontdatabase_qpa.h
+      text/qplatformfontdatabase.h
 
 DEFINES += QT_NO_OPENTYPE
 INCLUDEPATH += ../3rdparty/harfbuzz/src

src/gui/util/qdesktopservices.cpp

@@ -52,8 +52,8 @@
 #include <private/qguiapplication_p.h>
 #include <qurl.h>
 #include <qmutex.h>
-#include <qplatformservices_qpa.h>
-#include <qplatformintegration_qpa.h>
+#include <qpa/qplatformservices.h>
+#include <qpa/qplatformintegration.h>
 #include <qdir.h>
 
 QT_BEGIN_NAMESPACE

src/opengl/qgl.cpp

@@ -55,13 +55,13 @@
 
 #include "gl2paintengineex/qpaintengineex_opengl2_p.h"
 
-#include <QtGui/QPlatformOpenGLContext>
+#include <qpa/qplatformopenglcontext.h>
 
 #include <qglpixelbuffer.h>
 #include <qglframebufferobject.h>
 
 #include <private/qimage_p.h>
-#include <qplatformpixmap_qpa.h>
+#include <qpa/qplatformpixmap.h>
 #include <private/qglpixelbuffer_p.h>
 #include <private/qimagepixmapcleanuphooks_p.h>
 #include "qcolormap.h"

src/opengl/qgl_qpa.cpp

@@ -45,8 +45,8 @@
 #include <QDebug>
 
 #include <private/qapplication_p.h>
-#include <QtGui/QPlatformOpenGLContext>
-#include <QtGui/QPlatformWindow>
+#include <qpa/qplatformopenglcontext.h>
+#include <qpa/qplatformwindow.h>
 #include <QtGui/QSurfaceFormat>
 
 #include "qgl.h"

src/platformsupport/dnd/qsimpledrag_p.h

@@ -42,7 +42,7 @@
 #ifndef QSIMPLEDRAG_H
 #define QSIMPLEDRAG_H
 
-#include <qplatformdrag_qpa.h>
+#include <qpa/qplatformdrag.h>
 
 #include <QtCore/QObject>
 

src/platformsupport/eglconvenience/qeglplatformcontext.cpp

@@ -43,7 +43,7 @@
 
 #include "qeglconvenience_p.h"
 
-#include <QtGui/QPlatformWindow>
+#include <qpa/qplatformwindow.h>
 
 #include <EGL/egl.h>
 

src/platformsupport/eglconvenience/qeglplatformcontext_p.h

@@ -42,8 +42,8 @@
 #ifndef QEGLPLATFORMCONTEXT_H
 #define QEGLPLATFORMCONTEXT_H
 
-#include <QtGui/QPlatformWindow>
-#include <QtGui/QPlatformOpenGLContext>
+#include <qpa/qplatformwindow.h>
+#include <qpa/qplatformopenglcontext.h>
 #include <EGL/egl.h>
 
 class QEGLPlatformContext : public QPlatformOpenGLContext

src/platformsupport/fb_base/fb_base.cpp

@@ -43,7 +43,7 @@
 #include <qpainter.h>
 #include <qdebug.h>
 #include <qbitmap.h>
-#include <QPlatformCursor>
+#include <qpa/qplatformcursor.h>
 #include <QWindowSystemInterface>
 
 QPlatformSoftwareCursor::QPlatformSoftwareCursor(QPlatformScreen *scr)

src/platformsupport/fb_base/fb_base_p.h

@@ -46,9 +46,9 @@
 #include <qimage.h>
 #include <qtimer.h>
 #include <qpainter.h>
-#include <QPlatformCursor>
-#include <QPlatformScreen>
-#include <QPlatformWindow>
+#include <qpa/qplatformcursor.h>
+#include <qpa/qplatformscreen.h>
+#include <qpa/qplatformwindow.h>
 #include <QtGui/private/qwindowsurface_p.h>
 
 class QMouseEvent;

src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp

@@ -42,7 +42,7 @@
 #include "qbasicfontdatabase_p.h"
 
 #include <QtGui/private/qguiapplication_p.h>
-#include <QtGui/QPlatformScreen>
+#include <qpa/qplatformscreen.h>
 
 #include <QtCore/QFile>
 #include <QtCore/QLibraryInfo>

src/platformsupport/fontdatabases/basic/qbasicfontdatabase_p.h

@@ -42,7 +42,7 @@
 #ifndef QBASICFONTDATABASE_H
 #define QBASICFONTDATABASE_H
 
-#include <QPlatformFontDatabase>
+#include <qpa/qplatformfontdatabase.h>
 #include <QtCore/QByteArray>
 #include <QtCore/QString>
 

src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp

@@ -47,7 +47,7 @@
 
 #include <QtCore/QElapsedTimer>
 
-#include <QtGui/QPlatformScreen>
+#include <qpa/qplatformscreen.h>
 
 #include <QtGui/private/qfontengine_ft_p.h>
 #include <QtGui/private/qfontengine_p.h>

src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase_p.h

@@ -42,7 +42,7 @@
 #ifndef QFONTCONFIGDATABASE_H
 #define QFONTCONFIGDATABASE_H
 
-#include <QPlatformFontDatabase>
+#include <qpa/qplatformfontdatabase.h>
 #include <QtPlatformSupport/private/qbasicfontdatabase_p.h>
 
 QT_BEGIN_NAMESPACE

src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h

@@ -42,7 +42,7 @@
 #ifndef QCORETEXTFONTDATABASE_H
 #define QCORETEXTFONTDATABASE_H
 
-#include <QPlatformFontDatabase>
+#include <qpa/qplatformfontdatabase.h>
 
 QT_BEGIN_NAMESPACE