diff options
Diffstat (limited to 'src')
267 files changed, 341 insertions, 353 deletions
diff --git a/src/gui/accessible/accessible.pri b/src/gui/accessible/accessible.pri index 70ac033f77..abffa2ade8 100644 --- a/src/gui/accessible/accessible.pri +++ b/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 \ diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp index 02318468bb..af75693ca2 100644 --- a/src/gui/accessible/qaccessible.cpp +++ b/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> diff --git a/src/gui/accessible/qplatformaccessibility_qpa.h b/src/gui/accessible/qplatformaccessibility.h index b1efd7cb34..b1efd7cb34 100644 --- a/src/gui/accessible/qplatformaccessibility_qpa.h +++ b/src/gui/accessible/qplatformaccessibility.h diff --git a/src/gui/accessible/qplatformaccessibility_qpa.cpp b/src/gui/accessible/qplatformaccessibility_qpa.cpp index 91b5de1198..7ea5a5d2c8 100644 --- a/src/gui/accessible/qplatformaccessibility_qpa.cpp +++ b/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" diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri index 34a33aa0f0..737b7fcbd4 100644 --- a/src/gui/image/image.pri +++ b/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 += \ diff --git a/src/gui/image/qbitmap.cpp b/src/gui/image/qbitmap.cpp index f3c26dd5b2..499f9f48f2 100644 --- a/src/gui/image/qbitmap.cpp +++ b/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" diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index b8ec7de851..91b21227df 100644 --- a/src/gui/image/qimage.cpp +++ b/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> diff --git a/src/gui/image/qimagepixmapcleanuphooks.cpp b/src/gui/image/qimagepixmapcleanuphooks.cpp index b118f5f856..548934829e 100644 --- a/src/gui/image/qimagepixmapcleanuphooks.cpp +++ b/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" diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp index 96d7a0487b..c562b0bd6d 100644 --- a/src/gui/image/qnativeimage.cpp +++ b/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" diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index cefb8edf74..248caf7f3d 100644 --- a/src/gui/image/qpixmap.cpp +++ b/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" diff --git a/src/gui/image/qpixmap_blitter_p.h b/src/gui/image/qpixmap_blitter_p.h index 95397374c6..174277f9eb 100644 --- a/src/gui/image/qpixmap_blitter_p.h +++ b/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 diff --git a/src/gui/image/qpixmap_raster_p.h b/src/gui/image/qpixmap_raster_p.h index 864fad42ec..8e1a8ccc03 100644 --- a/src/gui/image/qpixmap_raster_p.h +++ b/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 diff --git a/src/gui/image/qpixmap_win.cpp b/src/gui/image/qpixmap_win.cpp index 66a829f5de..c25393c72e 100644 --- a/src/gui/image/qpixmap_win.cpp +++ b/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> diff --git a/src/gui/image/qplatformpixmap.cpp b/src/gui/image/qplatformpixmap.cpp index 073c267fbe..769cf5f90b 100644 --- a/src/gui/image/qplatformpixmap.cpp +++ b/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> diff --git a/src/gui/image/qplatformpixmap_qpa.h b/src/gui/image/qplatformpixmap.h index 154c5079a7..154c5079a7 100644 --- a/src/gui/image/qplatformpixmap_qpa.h +++ b/src/gui/image/qplatformpixmap.h diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri index 3c1b6b4e48..525871c89b 100644 --- a/src/gui/kernel/kernel.pri +++ b/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 diff --git a/src/gui/kernel/qclipboard_qpa.cpp b/src/gui/kernel/qclipboard_qpa.cpp index 187e09253e..284775c4e2 100644 --- a/src/gui/kernel/qclipboard_qpa.cpp +++ b/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 diff --git a/src/gui/kernel/qcursor_qpa.cpp b/src/gui/kernel/qcursor_qpa.cpp index 1c719c839e..cc9163fbc0 100644 --- a/src/gui/kernel/qcursor_qpa.cpp +++ b/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> diff --git a/src/gui/kernel/qdnd.cpp b/src/gui/kernel/qdnd.cpp index 1ed4a96192..8182719830 100644 --- a/src/gui/kernel/qdnd.cpp +++ b/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> diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 27e84b71a9..631592aace 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/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> diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h index 78641de55b..cb3587ba63 100644 --- a/src/gui/kernel/qguiapplication_p.h +++ b/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 diff --git a/src/gui/kernel/qinputmethod.cpp b/src/gui/kernel/qinputmethod.cpp index 0e0bc7237a..a699938dc6 100644 --- a/src/gui/kernel/qinputmethod.cpp +++ b/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 diff --git a/src/gui/kernel/qinputmethod_p.h b/src/gui/kernel/qinputmethod_p.h index 1e55b00318..ad3d2141c1 100644 --- a/src/gui/kernel/qinputmethod_p.h +++ b/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 diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp index 4946a1dc18..e88d901a2b 100644 --- a/src/gui/kernel/qkeysequence.cpp +++ b/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 diff --git a/src/gui/kernel/qopenglcontext.cpp b/src/gui/kernel/qopenglcontext.cpp index 4668f9e750..b99a4dbd04 100644 --- a/src/gui/kernel/qopenglcontext.cpp +++ b/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" diff --git a/src/gui/kernel/qplatformclipboard_qpa.h b/src/gui/kernel/qplatformclipboard.h index 95c8103b7e..95c8103b7e 100644 --- a/src/gui/kernel/qplatformclipboard_qpa.h +++ b/src/gui/kernel/qplatformclipboard.h diff --git a/src/gui/kernel/qplatformclipboard_qpa.cpp b/src/gui/kernel/qplatformclipboard_qpa.cpp index 7273450077..5a29606391 100644 --- a/src/gui/kernel/qplatformclipboard_qpa.cpp +++ b/src/gui/kernel/qplatformclipboard_qpa.cpp @@ -38,7 +38,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "qplatformclipboard_qpa.h" +#include "qplatformclipboard.h" #ifndef QT_NO_CLIPBOARD diff --git a/src/gui/kernel/qplatformcursor_qpa.h b/src/gui/kernel/qplatformcursor.h index fb3e4604d2..1f339c86b7 100644 --- a/src/gui/kernel/qplatformcursor_qpa.h +++ b/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 diff --git a/src/gui/kernel/qplatformcursor_qpa.cpp b/src/gui/kernel/qplatformcursor_qpa.cpp index 5ea080c40a..40b7967af7 100644 --- a/src/gui/kernel/qplatformcursor_qpa.cpp +++ b/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> diff --git a/src/gui/kernel/qplatformdialoghelper_qpa.h b/src/gui/kernel/qplatformdialoghelper.h index 5cd3ab055b..5cd3ab055b 100644 --- a/src/gui/kernel/qplatformdialoghelper_qpa.h +++ b/src/gui/kernel/qplatformdialoghelper.h diff --git a/src/gui/kernel/qplatformdialoghelper_qpa.cpp b/src/gui/kernel/qplatformdialoghelper_qpa.cpp index f2114d17e0..ec9906ca0e 100644 --- a/src/gui/kernel/qplatformdialoghelper_qpa.cpp +++ b/src/gui/kernel/qplatformdialoghelper_qpa.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qplatformdialoghelper_qpa.h" +#include "qplatformdialoghelper.h" #include <QtCore/QVariant> #include <QtCore/QSharedData> diff --git a/src/gui/kernel/qplatformdrag_qpa.h b/src/gui/kernel/qplatformdrag.h index 14282c5a21..14282c5a21 100644 --- a/src/gui/kernel/qplatformdrag_qpa.h +++ b/src/gui/kernel/qplatformdrag.h diff --git a/src/gui/kernel/qplatformdrag_qpa.cpp b/src/gui/kernel/qplatformdrag_qpa.cpp index d9fc3a2ab8..8367ad8e06 100644 --- a/src/gui/kernel/qplatformdrag_qpa.cpp +++ b/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> diff --git a/src/gui/kernel/qplatforminputcontext_qpa.h b/src/gui/kernel/qplatforminputcontext.h index 696146b859..696146b859 100644 --- a/src/gui/kernel/qplatforminputcontext_qpa.h +++ b/src/gui/kernel/qplatforminputcontext.h diff --git a/src/gui/kernel/qplatforminputcontext_qpa_p.h b/src/gui/kernel/qplatforminputcontext_p.h index dc12d26ffc..dc12d26ffc 100644 --- a/src/gui/kernel/qplatforminputcontext_qpa_p.h +++ b/src/gui/kernel/qplatforminputcontext_p.h diff --git a/src/gui/kernel/qplatforminputcontext_qpa.cpp b/src/gui/kernel/qplatforminputcontext_qpa.cpp index 53839088c5..0a8633b61d 100644 --- a/src/gui/kernel/qplatforminputcontext_qpa.cpp +++ b/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 diff --git a/src/gui/kernel/qplatformintegration_qpa.h b/src/gui/kernel/qplatformintegration.h index a44f4343ef..fb62dafc5c 100644 --- a/src/gui/kernel/qplatformintegration_qpa.h +++ b/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 diff --git a/src/gui/kernel/qplatformintegration_qpa.cpp b/src/gui/kernel/qplatformintegration_qpa.cpp index 5269d8fb24..8e4ed05576 100644 --- a/src/gui/kernel/qplatformintegration_qpa.cpp +++ b/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 diff --git a/src/gui/kernel/qplatformintegrationfactory_qpa_p.h b/src/gui/kernel/qplatformintegrationfactory_p.h index 4aae7898fa..4aae7898fa 100644 --- a/src/gui/kernel/qplatformintegrationfactory_qpa_p.h +++ b/src/gui/kernel/qplatformintegrationfactory_p.h diff --git a/src/gui/kernel/qplatformintegrationfactory_qpa.cpp b/src/gui/kernel/qplatformintegrationfactory_qpa.cpp index a84c243355..2092f2d0ba 100644 --- a/src/gui/kernel/qplatformintegrationfactory_qpa.cpp +++ b/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" diff --git a/src/gui/kernel/qplatformintegrationplugin_qpa.h b/src/gui/kernel/qplatformintegrationplugin.h index d70569cbba..d70569cbba 100644 --- a/src/gui/kernel/qplatformintegrationplugin_qpa.h +++ b/src/gui/kernel/qplatformintegrationplugin.h diff --git a/src/gui/kernel/qplatformintegrationplugin_qpa.cpp b/src/gui/kernel/qplatformintegrationplugin_qpa.cpp index 7bd1caa1d3..d4debd1f3a 100644 --- a/src/gui/kernel/qplatformintegrationplugin_qpa.cpp +++ b/src/gui/kernel/qplatformintegrationplugin_qpa.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qplatformintegrationplugin_qpa.h" +#include "qplatformintegrationplugin.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/kernel/qplatformnativeinterface_qpa.h b/src/gui/kernel/qplatformnativeinterface.h index 918ba4a9b8..918ba4a9b8 100644 --- a/src/gui/kernel/qplatformnativeinterface_qpa.h +++ b/src/gui/kernel/qplatformnativeinterface.h diff --git a/src/gui/kernel/qplatformnativeinterface_qpa.cpp b/src/gui/kernel/qplatformnativeinterface_qpa.cpp index c17eee4415..f0bd3f0658 100644 --- a/src/gui/kernel/qplatformnativeinterface_qpa.cpp +++ b/src/gui/kernel/qplatformnativeinterface_qpa.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qplatformnativeinterface_qpa.h" +#include "qplatformnativeinterface.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/kernel/qplatformopenglcontext_qpa.h b/src/gui/kernel/qplatformopenglcontext.h index ddcb87ad5a..ddcb87ad5a 100644 --- a/src/gui/kernel/qplatformopenglcontext_qpa.h +++ b/src/gui/kernel/qplatformopenglcontext.h diff --git a/src/gui/kernel/qplatformopenglcontext_qpa.cpp b/src/gui/kernel/qplatformopenglcontext_qpa.cpp index 33adc26482..d38a5864d6 100644 --- a/src/gui/kernel/qplatformopenglcontext_qpa.cpp +++ b/src/gui/kernel/qplatformopenglcontext_qpa.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qplatformopenglcontext_qpa.h" +#include "qplatformopenglcontext.h" #include <QOpenGLFunctions> diff --git a/src/gui/kernel/qplatformscreen_qpa.h b/src/gui/kernel/qplatformscreen.h index 71d734867e..075dfb114b 100644 --- a/src/gui/kernel/qplatformscreen_qpa.h +++ b/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 diff --git a/src/gui/kernel/qplatformscreen_qpa_p.h b/src/gui/kernel/qplatformscreen_p.h index ced66be8d7..ced66be8d7 100644 --- a/src/gui/kernel/qplatformscreen_qpa_p.h +++ b/src/gui/kernel/qplatformscreen_p.h diff --git a/src/gui/kernel/qplatformscreen_qpa.cpp b/src/gui/kernel/qplatformscreen_qpa.cpp index a26bd25408..6c2f98beb4 100644 --- a/src/gui/kernel/qplatformscreen_qpa.cpp +++ b/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> diff --git a/src/gui/kernel/qplatformscreenpageflipper_qpa.h b/src/gui/kernel/qplatformscreenpageflipper.h index 116d2dbf82..116d2dbf82 100644 --- a/src/gui/kernel/qplatformscreenpageflipper_qpa.h +++ b/src/gui/kernel/qplatformscreenpageflipper.h diff --git a/src/gui/kernel/qplatformscreenpageflipper_qpa.cpp b/src/gui/kernel/qplatformscreenpageflipper_qpa.cpp index b912c6055e..babecb061f 100644 --- a/src/gui/kernel/qplatformscreenpageflipper_qpa.cpp +++ b/src/gui/kernel/qplatformscreenpageflipper_qpa.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qplatformscreenpageflipper_qpa.h" +#include "qplatformscreenpageflipper.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/kernel/qplatformservices_qpa.h b/src/gui/kernel/qplatformservices.h index c9bfe020ab..c9bfe020ab 100644 --- a/src/gui/kernel/qplatformservices_qpa.h +++ b/src/gui/kernel/qplatformservices.h diff --git a/src/gui/kernel/qplatformservices_qpa.cpp b/src/gui/kernel/qplatformservices_qpa.cpp index 7993a82f4e..dac9e64e40 100644 --- a/src/gui/kernel/qplatformservices_qpa.cpp +++ b/src/gui/kernel/qplatformservices_qpa.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qplatformservices_qpa.h" +#include "qplatformservices.h" #include <QtCore/QUrl> #include <QtCore/QString> diff --git a/src/gui/kernel/qplatformsharedgraphicscache_qpa.h b/src/gui/kernel/qplatformsharedgraphicscache.h index 679b8ab7de..679b8ab7de 100644 --- a/src/gui/kernel/qplatformsharedgraphicscache_qpa.h +++ b/src/gui/kernel/qplatformsharedgraphicscache.h diff --git a/src/gui/kernel/qplatformsharedgraphicscache_qpa.cpp b/src/gui/kernel/qplatformsharedgraphicscache_qpa.cpp index 539bb1458f..a3bb8da358 100644 --- a/src/gui/kernel/qplatformsharedgraphicscache_qpa.cpp +++ b/src/gui/kernel/qplatformsharedgraphicscache_qpa.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qplatformsharedgraphicscache_qpa.h" +#include "qplatformsharedgraphicscache.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/kernel/qplatformsurface_qpa.h b/src/gui/kernel/qplatformsurface.h index f64a697fc5..f64a697fc5 100644 --- a/src/gui/kernel/qplatformsurface_qpa.h +++ b/src/gui/kernel/qplatformsurface.h diff --git a/src/gui/kernel/qplatformsurface_qpa.cpp b/src/gui/kernel/qplatformsurface_qpa.cpp index 1f752fe3e2..50cdd68ab6 100644 --- a/src/gui/kernel/qplatformsurface_qpa.cpp +++ b/src/gui/kernel/qplatformsurface_qpa.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qplatformsurface_qpa.h" +#include "qplatformsurface.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/kernel/qplatformtheme_qpa.h b/src/gui/kernel/qplatformtheme.h index 8d936e8267..8d936e8267 100644 --- a/src/gui/kernel/qplatformtheme_qpa.h +++ b/src/gui/kernel/qplatformtheme.h diff --git a/src/gui/kernel/qplatformtheme_qpa.cpp b/src/gui/kernel/qplatformtheme_qpa.cpp index c6314825d7..07a1d7f365 100644 --- a/src/gui/kernel/qplatformtheme_qpa.cpp +++ b/src/gui/kernel/qplatformtheme_qpa.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qplatformtheme_qpa.h" +#include "qplatformtheme.h" #include <QtCore/QVariant> #include <QtCore/QStringList> diff --git a/src/gui/kernel/qplatformthemefactory_qpa_p.h b/src/gui/kernel/qplatformthemefactory_p.h index 4d659812dc..4d659812dc 100644 --- a/src/gui/kernel/qplatformthemefactory_qpa_p.h +++ b/src/gui/kernel/qplatformthemefactory_p.h diff --git a/src/gui/kernel/qplatformthemefactory_qpa.cpp b/src/gui/kernel/qplatformthemefactory_qpa.cpp index c023a73e7e..8294591c4b 100644 --- a/src/gui/kernel/qplatformthemefactory_qpa.cpp +++ b/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" diff --git a/src/gui/kernel/qplatformthemeplugin_qpa.h b/src/gui/kernel/qplatformthemeplugin.h index 3ce7cc5b02..3ce7cc5b02 100644 --- a/src/gui/kernel/qplatformthemeplugin_qpa.h +++ b/src/gui/kernel/qplatformthemeplugin.h diff --git a/src/gui/kernel/qplatformthemeplugin_qpa.cpp b/src/gui/kernel/qplatformthemeplugin_qpa.cpp index da2743d6e3..be18716b28 100644 --- a/src/gui/kernel/qplatformthemeplugin_qpa.cpp +++ b/src/gui/kernel/qplatformthemeplugin_qpa.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qplatformthemeplugin_qpa.h" +#include "qplatformthemeplugin.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/kernel/qplatformwindow_qpa.h b/src/gui/kernel/qplatformwindow.h index 729f35e025..0b4c675e56 100644 --- a/src/gui/kernel/qplatformwindow_qpa.h +++ b/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 diff --git a/src/gui/kernel/qplatformwindow_qpa.cpp b/src/gui/kernel/qplatformwindow_qpa.cpp index b507eb4fdd..20817361f8 100644 --- a/src/gui/kernel/qplatformwindow_qpa.cpp +++ b/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> diff --git a/src/gui/kernel/qscreen.cpp b/src/gui/kernel/qscreen.cpp index 3546ce01dd..716caacb40 100644 --- a/src/gui/kernel/qscreen.cpp +++ b/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> diff --git a/src/gui/kernel/qscreen_p.h b/src/gui/kernel/qscreen_p.h index c6bf37e87a..0167384b01 100644 --- a/src/gui/kernel/qscreen_p.h +++ b/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> diff --git a/src/gui/kernel/qstylehints.cpp b/src/gui/kernel/qstylehints.cpp index 9384d34097..a98e5fbd76 100644 --- a/src/gui/kernel/qstylehints.cpp +++ b/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 diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index 8b37fce50c..6183b3f6ac 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/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" diff --git a/src/gui/kernel/qwindow_p.h b/src/gui/kernel/qwindow_p.h index 0afd903ead..92eaf90188 100644 --- a/src/gui/kernel/qwindow_p.h +++ b/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> diff --git a/src/gui/kernel/qwindowsysteminterface_qpa.cpp b/src/gui/kernel/qwindowsysteminterface_qpa.cpp index a0b77b8208..83cf8c338c 100644 --- a/src/gui/kernel/qwindowsysteminterface_qpa.cpp +++ b/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 diff --git a/src/gui/opengl/qopengltexturecache.cpp b/src/gui/opengl/qopengltexturecache.cpp index e4d5ff974d..d514d714bd 100644 --- a/src/gui/opengl/qopengltexturecache.cpp +++ b/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 diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri index a8f6a5bf8f..7a20f35b33 100644 --- a/src/gui/painting/painting.pri +++ b/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 diff --git a/src/gui/painting/qbackingstore.cpp b/src/gui/painting/qbackingstore.cpp index 63f7ba594f..14694769a9 100644 --- a/src/gui/painting/qbackingstore.cpp +++ b/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> diff --git a/src/gui/painting/qplatformbackingstore_qpa.h b/src/gui/painting/qplatformbackingstore.h index a4df63f4d4..a4df63f4d4 100644 --- a/src/gui/painting/qplatformbackingstore_qpa.h +++ b/src/gui/painting/qplatformbackingstore.h diff --git a/src/gui/painting/qplatformbackingstore_qpa.cpp b/src/gui/painting/qplatformbackingstore_qpa.cpp index 485190d301..34cda00a6e 100644 --- a/src/gui/painting/qplatformbackingstore_qpa.cpp +++ b/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> diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index 161bb4e23d..ccbd335d61 100644 --- a/src/gui/text/qfont.cpp +++ b/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> diff --git a/src/gui/text/qfont_qpa.cpp b/src/gui/text/qfont_qpa.cpp index b73b03025b..8422409cb3 100644 --- a/src/gui/text/qfont_qpa.cpp +++ b/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 diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index a1af856992..0a56ca3742 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/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> diff --git a/src/gui/text/qfontdatabase_qpa.cpp b/src/gui/text/qfontdatabase_qpa.cpp index c2a3aa9722..d7e5441931 100644 --- a/src/gui/text/qfontdatabase_qpa.cpp +++ b/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> diff --git a/src/gui/text/qfontengine_qpa.cpp b/src/gui/text/qfontengine_qpa.cpp index bf0cfd1404..dcb0a4f8d1 100644 --- a/src/gui/text/qfontengine_qpa.cpp +++ b/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 diff --git a/src/gui/text/qplatformfontdatabase_qpa.h b/src/gui/text/qplatformfontdatabase.h index 08faf8d84f..08faf8d84f 100644 --- a/src/gui/text/qplatformfontdatabase_qpa.h +++ b/src/gui/text/qplatformfontdatabase.h diff --git a/src/gui/text/qplatformfontdatabase_qpa.cpp b/src/gui/text/qplatformfontdatabase_qpa.cpp index 632d2d89d9..3531202eff 100644 --- a/src/gui/text/qplatformfontdatabase_qpa.cpp +++ b/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> diff --git a/src/gui/text/qrawfont_qpa.cpp b/src/gui/text/qrawfont_qpa.cpp index d037d5902d..7289450e7f 100644 --- a/src/gui/text/qrawfont_qpa.cpp +++ b/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 diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri index 6587769712..d0dd0ed129 100644 --- a/src/gui/text/text.pri +++ b/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 diff --git a/src/gui/util/qdesktopservices.cpp b/src/gui/util/qdesktopservices.cpp index a941c06031..0fba6e6f3a 100644 --- a/src/gui/util/qdesktopservices.cpp +++ b/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 diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index e306ea4476..d298777c30 100644 --- a/src/opengl/qgl.cpp +++ b/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" diff --git a/src/opengl/qgl_qpa.cpp b/src/opengl/qgl_qpa.cpp index 8810b70f08..05c0d9fe39 100644 --- a/src/opengl/qgl_qpa.cpp +++ b/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" diff --git a/src/platformsupport/dnd/qsimpledrag_p.h b/src/platformsupport/dnd/qsimpledrag_p.h index 7270684082..fa87f09d06 100644 --- a/src/platformsupport/dnd/qsimpledrag_p.h +++ b/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> diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp index 71e18203fb..97b4571dbf 100644 --- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp +++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp @@ -43,7 +43,7 @@ #include "qeglconvenience_p.h" -#include <QtGui/QPlatformWindow> +#include <qpa/qplatformwindow.h> #include <EGL/egl.h> diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext_p.h b/src/platformsupport/eglconvenience/qeglplatformcontext_p.h index 75375fa781..d48d49a696 100644 --- a/src/platformsupport/eglconvenience/qeglplatformcontext_p.h +++ b/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 diff --git a/src/platformsupport/fb_base/fb_base.cpp b/src/platformsupport/fb_base/fb_base.cpp index 0cdd091df2..516274962d 100644 --- a/src/platformsupport/fb_base/fb_base.cpp +++ b/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) diff --git a/src/platformsupport/fb_base/fb_base_p.h b/src/platformsupport/fb_base/fb_base_p.h index c9862c6c58..187ae961bf 100644 --- a/src/platformsupport/fb_base/fb_base_p.h +++ b/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; diff --git a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp index cddc08c750..e96659d4f6 100644 --- a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp +++ b/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> diff --git a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase_p.h b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase_p.h index fd6e180c75..eb4b11ca97 100644 --- a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase_p.h +++ b/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> diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp index 9ad9b96d15..d995ffbbad 100644 --- a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp +++ b/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> diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase_p.h b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase_p.h index df62ddeb0b..9859bd7082 100644 --- a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase_p.h +++ b/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 diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h index 01aed89d47..e38e01d25d 100644 --- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h +++ b/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 diff --git a/src/platformsupport/inputcontext/inputcontext.pri b/src/platformsupport/inputcontext/inputcontext.pri index e1a44684ba..8debcd0129 100644 --- a/src/platformsupport/inputcontext/inputcontext.pri +++ b/src/platformsupport/inputcontext/inputcontext.pri @@ -1,6 +1,6 @@ HEADERS += \ - $$PWD/qplatforminputcontextplugin_qpa_p.h \ - $$PWD/qplatforminputcontextfactory_qpa_p.h + $$PWD/qplatforminputcontextplugin_p.h \ + $$PWD/qplatforminputcontextfactory_p.h SOURCES += \ $$PWD/qplatforminputcontextplugin_qpa.cpp \ $$PWD/qplatforminputcontextfactory_qpa.cpp diff --git a/src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa_p.h b/src/platformsupport/inputcontext/qplatforminputcontextfactory_p.h index a7ed2ebfb3..a7ed2ebfb3 100644 --- a/src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa_p.h +++ b/src/platformsupport/inputcontext/qplatforminputcontextfactory_p.h diff --git a/src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa.cpp b/src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa.cpp index ca3673f670..6d909426a8 100644 --- a/src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa.cpp +++ b/src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "qplatforminputcontextfactory_qpa_p.h" -#include "qplatforminputcontextplugin_qpa_p.h" -#include <QPlatformInputContext> +#include <qpa/qplatforminputcontextfactory_p.h> +#include <qpa/qplatforminputcontextplugin_p.h> +#include <qpa/qplatforminputcontext.h> #include "private/qfactoryloader_p.h" #include "qguiapplication.h" diff --git a/src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa_p.h b/src/platformsupport/inputcontext/qplatforminputcontextplugin_p.h index e9e419546b..e9e419546b 100644 --- a/src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa_p.h +++ b/src/platformsupport/inputcontext/qplatforminputcontextplugin_p.h diff --git a/src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa.cpp b/src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa.cpp index 88cd9cdf67..670bfd0de5 100644 --- a/src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa.cpp +++ b/src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qplatforminputcontextplugin_qpa_p.h" +#include "qplatforminputcontextplugin_p.h" QT_BEGIN_NAMESPACE diff --git a/src/platformsupport/printersupport/genericunix/qgenericunixprintersupport_p.h b/src/platformsupport/printersupport/genericunix/qgenericunixprintersupport_p.h index 369e8274fd..d6b2d0d080 100644 --- a/src/platformsupport/printersupport/genericunix/qgenericunixprintersupport_p.h +++ b/src/platformsupport/printersupport/genericunix/qgenericunixprintersupport_p.h @@ -42,7 +42,7 @@ #ifndef QGENERICUNIXPRINTINGSUPPORT_H #define QGENERICUNIXPRINTINGSUPPORT_H -#include <QtPrintSupport/QPlatformPrinterSupport> +#include <qpa/qplatformprintersupport.h> QT_BEGIN_NAMESPACE diff --git a/src/platformsupport/services/genericunix/qgenericunixservices_p.h b/src/platformsupport/services/genericunix/qgenericunixservices_p.h index 3923a45f89..b0dbccc099 100644 --- a/src/platformsupport/services/genericunix/qgenericunixservices_p.h +++ b/src/platformsupport/services/genericunix/qgenericunixservices_p.h @@ -42,7 +42,7 @@ #ifndef QGENERICUNIXDESKTOPSERVICES_H #define QGENERICUNIXDESKTOPSERVICES_H -#include <QtGui/qplatformservices_qpa.h> +#include <qpa/qplatformservices.h> #include <QtCore/QString> QT_BEGIN_HEADER diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h b/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h index cabffc0212..a1b50865ed 100644 --- a/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h +++ b/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h @@ -42,7 +42,7 @@ #ifndef QGENERICUNIXTHEMES_H #define QGENERICUNIXTHEMES_H -#include <QtGui/QPlatformTheme> +#include <qpa/qplatformtheme.h> #include <QtCore/QString> #include <QtCore/QStringList> diff --git a/src/plugins/platforminputcontexts/ibus/ibus.pro b/src/plugins/platforminputcontexts/ibus/ibus.pro index 12419343fa..0fb92f23a8 100644 --- a/src/plugins/platforminputcontexts/ibus/ibus.pro +++ b/src/plugins/platforminputcontexts/ibus/ibus.pro @@ -3,7 +3,7 @@ load(qt_plugin) QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforminputcontexts -QT += dbus platformsupport-private +QT += dbus platformsupport-private gui-private SOURCES += $$PWD/qibusplatforminputcontext.cpp \ $$PWD/qibusproxy.cpp \ $$PWD/qibusinputcontextproxy.cpp \ diff --git a/src/plugins/platforminputcontexts/ibus/main.cpp b/src/plugins/platforminputcontexts/ibus/main.cpp index 19f032b7df..d841426ea7 100644 --- a/src/plugins/platforminputcontexts/ibus/main.cpp +++ b/src/plugins/platforminputcontexts/ibus/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <private/qplatforminputcontextplugin_qpa_p.h> +#include <qpa/qplatforminputcontextplugin_p.h> #include <QtCore/QStringList> #include "qibusplatforminputcontext.h" diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h index 1ed4262ef6..4d9f42e8d0 100644 --- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h +++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h @@ -41,7 +41,7 @@ #ifndef QIBUSPLATFORMINPUTCONTEXT_H #define QIBUSPLATFORMINPUTCONTEXT_H -#include <QPlatformInputContext> +#include <qpa/qplatforminputcontext.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforminputcontexts/maliit/main.cpp b/src/plugins/platforminputcontexts/maliit/main.cpp index 2552cc0aa6..adeaa7bb31 100644 --- a/src/plugins/platforminputcontexts/maliit/main.cpp +++ b/src/plugins/platforminputcontexts/maliit/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <private/qplatforminputcontextplugin_qpa_p.h> +#include <qpa/qplatforminputcontextplugin_p.h> #include <QtCore/QStringList> #include "qmaliitplatforminputcontext.h" diff --git a/src/plugins/platforminputcontexts/maliit/maliit.pro b/src/plugins/platforminputcontexts/maliit/maliit.pro index 445e172637..dbcd22efcb 100644 --- a/src/plugins/platforminputcontexts/maliit/maliit.pro +++ b/src/plugins/platforminputcontexts/maliit/maliit.pro @@ -3,7 +3,7 @@ load(qt_plugin) QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforminputcontexts -QT += dbus platformsupport-private +QT += dbus platformsupport-private gui-private SOURCES += $$PWD/qmaliitplatforminputcontext.cpp \ $$PWD/serverproxy.cpp \ $$PWD/serveraddressproxy.cpp \ diff --git a/src/plugins/platforminputcontexts/maliit/qmaliitplatforminputcontext.h b/src/plugins/platforminputcontexts/maliit/qmaliitplatforminputcontext.h index 2612524619..cb32feed61 100644 --- a/src/plugins/platforminputcontexts/maliit/qmaliitplatforminputcontext.h +++ b/src/plugins/platforminputcontexts/maliit/qmaliitplatforminputcontext.h @@ -41,7 +41,7 @@ #ifndef QMALIITPLATFORMINPUTCONTEXT_H #define QMALIITPLATFORMINPUTCONTEXT_H -#include <QPlatformInputContext> +#include <qpa/qplatforminputcontext.h> #include <QDBusArgument> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro index f149a6775b..ccd98c5b3c 100644 --- a/src/plugins/platforms/cocoa/cocoa.pro +++ b/src/plugins/platforms/cocoa/cocoa.pro @@ -77,7 +77,7 @@ RESOURCES += qcocoaresources.qrc LIBS += -framework Cocoa -framework IOKit -QT += core-private gui-private widgets-private platformsupport-private printsupport +QT += core-private gui-private widgets-private platformsupport-private printsupport-private OTHER_FILES += cocoa.json target.path += $$[QT_INSTALL_PLUGINS]/platforms diff --git a/src/plugins/platforms/cocoa/main.mm b/src/plugins/platforms/cocoa/main.mm index 9857a4e177..fc17bd3fe2 100644 --- a/src/plugins/platforms/cocoa/main.mm +++ b/src/plugins/platforms/cocoa/main.mm @@ -41,8 +41,8 @@ #include <Cocoa/Cocoa.h> -#include <QtGui/QPlatformIntegrationPlugin> -#include <QtGui/QPlatformThemePlugin> +#include <qpa/qplatformintegrationplugin.h> +#include <qpa/qplatformthemeplugin.h> #include "qcocoaintegration.h" #include "qcocoatheme.h" diff --git a/src/plugins/platforms/cocoa/qcocoabackingstore.h b/src/plugins/platforms/cocoa/qcocoabackingstore.h index 72bb5936c0..36fb4b42ff 100644 --- a/src/plugins/platforms/cocoa/qcocoabackingstore.h +++ b/src/plugins/platforms/cocoa/qcocoabackingstore.h @@ -47,7 +47,7 @@ #include "qcocoawindow.h" #include "qnsview.h" -#include <QPlatformBackingStore> +#include <qpa/qplatformbackingstore.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoaclipboard.h b/src/plugins/platforms/cocoa/qcocoaclipboard.h index 27505058bf..d387ae9eb0 100644 --- a/src/plugins/platforms/cocoa/qcocoaclipboard.h +++ b/src/plugins/platforms/cocoa/qcocoaclipboard.h @@ -42,7 +42,7 @@ #ifndef QCOCOACLIPBOARD_H #define QCOCOACLIPBOARD_H -#include <qplatformclipboard_qpa.h> +#include <qpa/qplatformclipboard.h> #include "qmacclipboard.h" #include <QtCore/QScopedPointer> diff --git a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.h b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.h index 4b901f3ef3..8845d7fdcd 100644 --- a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.h +++ b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.h @@ -43,7 +43,7 @@ #define QCOCOACOLORDIALOGHELPER_H #include <QObject> -#include <qplatformdialoghelper_qpa.h> +#include <qpa/qplatformdialoghelper.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoacursor.h b/src/plugins/platforms/cocoa/qcocoacursor.h index 85892ee820..b57d624b61 100644 --- a/src/plugins/platforms/cocoa/qcocoacursor.h +++ b/src/plugins/platforms/cocoa/qcocoacursor.h @@ -45,7 +45,7 @@ #include <Cocoa/Cocoa.h> #include <QtCore> -#include <QtGui/QPlatformCursor> +#include <qpa/qplatformcursor.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoadrag.h b/src/plugins/platforms/cocoa/qcocoadrag.h index 17df54f748..5a0a3fa271 100644 --- a/src/plugins/platforms/cocoa/qcocoadrag.h +++ b/src/plugins/platforms/cocoa/qcocoadrag.h @@ -44,7 +44,7 @@ #include <Cocoa/Cocoa.h> #include <QtGui> -#include <qplatformdrag_qpa.h> +#include <qpa/qplatformdrag.h> #include <QtPlatformSupport/private/qsimpledrag_p.h> #include <QtGui/private/qdnd_p.h> diff --git a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm index a3bd4a95ca..ddaa7a762b 100644 --- a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm +++ b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm @@ -81,8 +81,8 @@ #include "qhash.h" #include "qmutex.h" #include "qsocketnotifier.h" -#include <qplatformwindow_qpa.h> -#include <qplatformnativeinterface_qpa.h> +#include <qpa/qplatformwindow.h> +#include <qpa/qplatformnativeinterface.h> #include "private/qthread_p.h" #include "private/qguiapplication_p.h" #include <qdebug.h> diff --git a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.h b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.h index 9768d3e6f9..5b7af09fb8 100644 --- a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.h +++ b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.h @@ -43,7 +43,7 @@ #define QCOCOAFILEDIALOGHELPER_H #include <QObject> -#include <qplatformdialoghelper_qpa.h> +#include <qpa/qplatformdialoghelper.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoafontdialoghelper.h b/src/plugins/platforms/cocoa/qcocoafontdialoghelper.h index f9dd4357a5..501e67deb3 100644 --- a/src/plugins/platforms/cocoa/qcocoafontdialoghelper.h +++ b/src/plugins/platforms/cocoa/qcocoafontdialoghelper.h @@ -43,7 +43,7 @@ #define QCOCOAFONTDIALOGHELPER_H #include <QObject> -#include <qplatformdialoghelper_qpa.h> +#include <qpa/qplatformdialoghelper.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoaglcontext.h b/src/plugins/platforms/cocoa/qcocoaglcontext.h index 4f80511f61..6c0fcd1077 100644 --- a/src/plugins/platforms/cocoa/qcocoaglcontext.h +++ b/src/plugins/platforms/cocoa/qcocoaglcontext.h @@ -43,7 +43,7 @@ #define QCOCOAGLCONTEXT_H #include <QtCore/QWeakPointer> -#include <QtGui/QPlatformOpenGLContext> +#include <qpa/qplatformopenglcontext.h> #include <QtGui/QOpenGLContext> #include <QtGui/QWindow> diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.mm b/src/plugins/platforms/cocoa/qcocoahelpers.mm index 60590b966e..8f8d7b84a6 100644 --- a/src/plugins/platforms/cocoa/qcocoahelpers.mm +++ b/src/plugins/platforms/cocoa/qcocoahelpers.mm @@ -45,7 +45,7 @@ #include <QtCore> #include <QtGui> -#include <qplatformscreen_qpa.h> +#include <qpa/qplatformscreen.h> #include <private/qguiapplication_p.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoainputcontext.h b/src/plugins/platforms/cocoa/qcocoainputcontext.h index 1fda29209d..743931193d 100644 --- a/src/plugins/platforms/cocoa/qcocoainputcontext.h +++ b/src/plugins/platforms/cocoa/qcocoainputcontext.h @@ -42,7 +42,7 @@ #ifndef QCOCOAINPUTCONTEXT_H #define QCOCOAINPUTCONTEXT_H -#include <QtGui/QPlatformInputContext> +#include <qpa/qplatforminputcontext.h> #include <QtCore/QPointer> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.h b/src/plugins/platforms/cocoa/qcocoaintegration.h index a001b6234a..da84969f00 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.h +++ b/src/plugins/platforms/cocoa/qcocoaintegration.h @@ -51,7 +51,7 @@ #include "qcocoaservices.h" #include <QtCore/QScopedPointer> -#include <QtGui/QPlatformIntegration> +#include <qpa/qplatformintegration.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm index 0b87773dee..b82519fd97 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.mm +++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm @@ -55,7 +55,7 @@ #include "qcocoainputcontext.h" #include "qmacmime.h" -#include <QtGui/qplatformaccessibility_qpa.h> +#include <qpa/qplatformaccessibility.h> #include <QtCore/qcoreapplication.h> #include <QtWidgets/QDialog> diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.h b/src/plugins/platforms/cocoa/qcocoanativeinterface.h index bb4d0f9f6c..0346eafec4 100644 --- a/src/plugins/platforms/cocoa/qcocoanativeinterface.h +++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.h @@ -42,8 +42,8 @@ #ifndef QCOCOANATIVEINTERFACE_H #define QCOCOANATIVEINTERFACE_H -#include <QtGui/QPlatformNativeInterface> -#include <QtPrintSupport/QPlatformPrinterSupport> +#include <qpa/qplatformnativeinterface.h> +#include <qpa/qplatformprintersupport.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm index ca15b6bbfb..df9ae23606 100644 --- a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm +++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm @@ -46,9 +46,9 @@ #include <qbytearray.h> #include <qwindow.h> -#include "qplatformwindow_qpa.h" +#include <qpa/qplatformwindow.h> #include "qsurfaceformat.h" -#include "qplatformopenglcontext_qpa.h" +#include <qpa/qplatformopenglcontext.h> #include "qopenglcontext.h" #include <qdebug.h> diff --git a/src/plugins/platforms/cocoa/qcocoaprintersupport.h b/src/plugins/platforms/cocoa/qcocoaprintersupport.h index 2309025bb3..88a83a4f4e 100644 --- a/src/plugins/platforms/cocoa/qcocoaprintersupport.h +++ b/src/plugins/platforms/cocoa/qcocoaprintersupport.h @@ -42,7 +42,7 @@ #ifndef QCOCOAPRINTERSUPPORT_H #define QCOCOAPRINTERSUPPORT_H -#include <QtPrintSupport/QPlatformPrinterSupport> +#include <qpa/qplatformprintersupport.h> class QCocoaPrinterSupport : public QPlatformPrinterSupport { diff --git a/src/plugins/platforms/cocoa/qcocoaservices.h b/src/plugins/platforms/cocoa/qcocoaservices.h index 022c39dc57..e3f5b3dbf0 100644 --- a/src/plugins/platforms/cocoa/qcocoaservices.h +++ b/src/plugins/platforms/cocoa/qcocoaservices.h @@ -42,7 +42,7 @@ #ifndef QCOCOADESKTOPSERVICES_H #define QCOCOADESKTOPSERVICES_H -#include <QtGui/qplatformservices_qpa.h> +#include <qpa/qplatformservices.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoasystemsettings.h b/src/plugins/platforms/cocoa/qcocoasystemsettings.h index 10cac27dcd..5e1249759b 100644 --- a/src/plugins/platforms/cocoa/qcocoasystemsettings.h +++ b/src/plugins/platforms/cocoa/qcocoasystemsettings.h @@ -44,7 +44,7 @@ #include <QtCore/qhash.h> #include <QtGui/qpalette.h> -#include <QtGui/qplatformtheme_qpa.h> +#include <qpa/qplatformtheme.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoatheme.h b/src/plugins/platforms/cocoa/qcocoatheme.h index 5cb6f7437d..791f1d4a50 100644 --- a/src/plugins/platforms/cocoa/qcocoatheme.h +++ b/src/plugins/platforms/cocoa/qcocoatheme.h @@ -43,7 +43,7 @@ #define QPLATFORMTHEME_COCOA_H #include <QtCore/QHash> -#include <QtGui/QPlatformTheme> +#include <qpa/qplatformtheme.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/cocoa/qcocoawindow.h index d08bbe79ce..f2d6ac67bb 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.h +++ b/src/plugins/platforms/cocoa/qcocoawindow.h @@ -44,7 +44,7 @@ #include <Cocoa/Cocoa.h> -#include <QPlatformWindow> +#include <qpa/qplatformwindow.h> #include <QRect> #include "qcocoaglcontext.h" diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index 83b6534b7c..5480b32083 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -48,7 +48,7 @@ #include <QtCore/private/qcore_mac_p.h> #include <qwindow.h> #include <QWindowSystemInterface> -#include <QPlatformScreen> +#include <qpa/qplatformscreen.h> #include <Cocoa/Cocoa.h> #include <Carbon/Carbon.h> diff --git a/src/plugins/platforms/cocoa/qmenu_mac.h b/src/plugins/platforms/cocoa/qmenu_mac.h index d41540a341..7a91e2d5e8 100644 --- a/src/plugins/platforms/cocoa/qmenu_mac.h +++ b/src/plugins/platforms/cocoa/qmenu_mac.h @@ -43,7 +43,7 @@ #include <QtCore/qpointer.h> #include <QtWidgets/qmenu.h> #include <QtWidgets/qmenubar.h> -#include <QtWidgets/qplatformmenu_qpa.h> +#include <qpa/qplatformmenu.h> @class NSMenuItem; diff --git a/src/plugins/platforms/cocoa/qpaintengine_mac.mm b/src/plugins/platforms/cocoa/qpaintengine_mac.mm index 87f3713920..33e6e397a2 100644 --- a/src/plugins/platforms/cocoa/qpaintengine_mac.mm +++ b/src/plugins/platforms/cocoa/qpaintengine_mac.mm @@ -56,7 +56,7 @@ #include <qcoreapplication.h> #include <qmath.h> -#include <QtGui/qplatformpixmap_qpa.h> +#include <qpa/qplatformpixmap.h> #include <private/qfont_p.h> #include <private/qfontengine_p.h> diff --git a/src/plugins/platforms/cocoa/qprintengine_mac.mm b/src/plugins/platforms/cocoa/qprintengine_mac.mm index e432b12e67..921dd2f78f 100644 --- a/src/plugins/platforms/cocoa/qprintengine_mac.mm +++ b/src/plugins/platforms/cocoa/qprintengine_mac.mm @@ -43,7 +43,7 @@ #include <qdebug.h> #include <qthread.h> #include <QtCore/qcoreapplication.h> -#include <QtPrintSupport/QPlatformPrinterSupport> +#include <qpa/qplatformprintersupport.h> #include "qcocoaautoreleasepool.h" diff --git a/src/plugins/platforms/directfb/main.cpp b/src/plugins/platforms/directfb/main.cpp index 26bdd719ca..86af137249 100644 --- a/src/plugins/platforms/directfb/main.cpp +++ b/src/plugins/platforms/directfb/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtGui/QPlatformIntegrationPlugin> +#include <qpa/qplatformintegrationplugin.h> #include "qdirectfbintegration.h" #include "qdirectfb_egl.h" diff --git a/src/plugins/platforms/directfb/qdirectfb_egl.cpp b/src/plugins/platforms/directfb/qdirectfb_egl.cpp index ac9142c0f4..f595cc4286 100644 --- a/src/plugins/platforms/directfb/qdirectfb_egl.cpp +++ b/src/plugins/platforms/directfb/qdirectfb_egl.cpp @@ -45,7 +45,7 @@ #include "qdirectfbeglhooks.h" #include <QtGui/QOpenGLContext> -#include <QtGui/QPlatformOpenGLContext> +#include <qpa/qplatformopenglcontext.h> #include <QtGui/QScreen> #include <QtPlatformSupport/private/qeglplatformcontext_p.h> diff --git a/src/plugins/platforms/directfb/qdirectfbbackingstore.h b/src/plugins/platforms/directfb/qdirectfbbackingstore.h index 327329a563..63ce626f06 100644 --- a/src/plugins/platforms/directfb/qdirectfbbackingstore.h +++ b/src/plugins/platforms/directfb/qdirectfbbackingstore.h @@ -42,7 +42,7 @@ #ifndef QWINDOWSURFACE_DIRECTFB_H #define QWINDOWSURFACE_DIRECTFB_H -#include <qplatformbackingstore_qpa.h> +#include <qpa/qplatformbackingstore.h> #include <private/qpixmap_blitter_p.h> #include <directfb.h> diff --git a/src/plugins/platforms/directfb/qdirectfbcursor.h b/src/plugins/platforms/directfb/qdirectfbcursor.h index f28e225dc7..64133901d7 100644 --- a/src/plugins/platforms/directfb/qdirectfbcursor.h +++ b/src/plugins/platforms/directfb/qdirectfbcursor.h @@ -42,7 +42,7 @@ #ifndef QDIRECTFBCURSOR_H #define QDIRECTFBCURSOR_H -#include <QPlatformCursor> +#include <qpa/qplatformcursor.h> #include <directfb.h> #include "qdirectfbconvenience.h" diff --git a/src/plugins/platforms/directfb/qdirectfbeglhooks.h b/src/plugins/platforms/directfb/qdirectfbeglhooks.h index d0711b62dd..96bce3b3e8 100644 --- a/src/plugins/platforms/directfb/qdirectfbeglhooks.h +++ b/src/plugins/platforms/directfb/qdirectfbeglhooks.h @@ -42,7 +42,7 @@ #ifndef QDIRECTFBEGL_HOOKS_H #define QDIRECTFBEGL_HOOKS_H -#include "qplatformintegration_qpa.h" +#include <qpa/qplatformintegration.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/directfb/qdirectfbglcontext.h b/src/plugins/platforms/directfb/qdirectfbglcontext.h index 7aac12c2f9..3e684ceef9 100644 --- a/src/plugins/platforms/directfb/qdirectfbglcontext.h +++ b/src/plugins/platforms/directfb/qdirectfbglcontext.h @@ -42,7 +42,7 @@ #ifndef QDIRECTFBGLCONTEXT_H #define QDIRECTFBGLCONTEXT_H -#include <QPlatformOpenGLContext> +#include <qpa/qplatformopenglcontext.h> #include "qdirectfbconvenience.h" diff --git a/src/plugins/platforms/directfb/qdirectfbintegration.cpp b/src/plugins/platforms/directfb/qdirectfbintegration.cpp index d167c465be..834e7dace7 100644 --- a/src/plugins/platforms/directfb/qdirectfbintegration.cpp +++ b/src/plugins/platforms/directfb/qdirectfbintegration.cpp @@ -52,7 +52,7 @@ #include <QtGui/private/qpixmap_blitter_p.h> #include <QtGui/private/qpixmap_raster_p.h> #include <QtGui/private/qguiapplication_p.h> -#include <QtGui/qplatformpixmap_qpa.h> +#include <qpa/qplatformpixmap.h> #include <QtCore/QCoreApplication> #include <QtCore/QThread> #include <QtCore/QAbstractEventDispatcher> diff --git a/src/plugins/platforms/directfb/qdirectfbintegration.h b/src/plugins/platforms/directfb/qdirectfbintegration.h index 56d785e00f..c959ae5a33 100644 --- a/src/plugins/platforms/directfb/qdirectfbintegration.h +++ b/src/plugins/platforms/directfb/qdirectfbintegration.h @@ -45,7 +45,7 @@ #include "qdirectfbinput.h" #include "qdirectfbscreen.h" -#include <QtGui/QPlatformIntegration> +#include <qpa/qplatformintegration.h> #include <directfb.h> #include <directfb_version.h> diff --git a/src/plugins/platforms/directfb/qdirectfbscreen.h b/src/plugins/platforms/directfb/qdirectfbscreen.h index 8535239088..6e2aa0d9bf 100644 --- a/src/plugins/platforms/directfb/qdirectfbscreen.h +++ b/src/plugins/platforms/directfb/qdirectfbscreen.h @@ -45,7 +45,7 @@ #include "qdirectfbconvenience.h" #include "qdirectfbcursor.h" -#include <QtGui/QPlatformIntegration> +#include <qpa/qplatformintegration.h> #include <directfb.h> diff --git a/src/plugins/platforms/directfb/qdirectfbwindow.h b/src/plugins/platforms/directfb/qdirectfbwindow.h index e0206b5d02..bc9e4d9c4e 100644 --- a/src/plugins/platforms/directfb/qdirectfbwindow.h +++ b/src/plugins/platforms/directfb/qdirectfbwindow.h @@ -42,7 +42,7 @@ #ifndef QDIRECTFBWINDOW_H #define QDIRECTFBWINDOW_H -#include <QPlatformWindow> +#include <qpa/qplatformwindow.h> #include "qdirectfbconvenience.h" #include "qdirectfbinput.h" diff --git a/src/plugins/platforms/eglfs/main.cpp b/src/plugins/platforms/eglfs/main.cpp index 2ca2199619..4565b79610 100644 --- a/src/plugins/platforms/eglfs/main.cpp +++ b/src/plugins/platforms/eglfs/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtGui/QPlatformIntegrationPlugin> +#include <qpa/qplatformintegrationplugin.h> #include "qeglfsintegration.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/eglfs/qeglfsbackingstore.h b/src/plugins/platforms/eglfs/qeglfsbackingstore.h index f723bca685..e9808b7f95 100644 --- a/src/plugins/platforms/eglfs/qeglfsbackingstore.h +++ b/src/plugins/platforms/eglfs/qeglfsbackingstore.h @@ -42,7 +42,7 @@ #ifndef QEGLFSBACKINGSTORE_H #define QEGLFSBACKINGSTORE_H -#include <QtGui/qplatformbackingstore_qpa.h> +#include <qpa/qplatformbackingstore.h> #include <QImage> #include <QRegion> diff --git a/src/plugins/platforms/eglfs/qeglfshooks.h b/src/plugins/platforms/eglfs/qeglfshooks.h index a56c80261b..c6ea209a6f 100644 --- a/src/plugins/platforms/eglfs/qeglfshooks.h +++ b/src/plugins/platforms/eglfs/qeglfshooks.h @@ -42,7 +42,7 @@ #ifndef QEGLFSHOOKS_H #define QEGLFSHOOKS_H -#include "qplatformintegration_qpa.h" +#include <qpa/qplatformintegration.h> #include <EGL/egl.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/eglfs/qeglfsintegration.cpp b/src/plugins/platforms/eglfs/qeglfsintegration.cpp index 9b7d9246f9..7025aed4a8 100644 --- a/src/plugins/platforms/eglfs/qeglfsintegration.cpp +++ b/src/plugins/platforms/eglfs/qeglfsintegration.cpp @@ -48,7 +48,7 @@ #include <QtPlatformSupport/private/qgenericunixfontdatabase_p.h> #include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h> -#include <QtGui/QPlatformWindow> +#include <qpa/qplatformwindow.h> #include <QtGui/QSurfaceFormat> #include <QtGui/QOpenGLContext> #include <QtGui/QScreen> diff --git a/src/plugins/platforms/eglfs/qeglfsintegration.h b/src/plugins/platforms/eglfs/qeglfsintegration.h index eea36a489d..b7cb715a9c 100644 --- a/src/plugins/platforms/eglfs/qeglfsintegration.h +++ b/src/plugins/platforms/eglfs/qeglfsintegration.h @@ -44,8 +44,8 @@ #include "qeglfsscreen.h" -#include <QtGui/QPlatformIntegration> -#include <QtGui/QPlatformScreen> +#include <qpa/qplatformintegration.h> +#include <qpa/qplatformscreen.h> QT_BEGIN_HEADER diff --git a/src/plugins/platforms/eglfs/qeglfsscreen.h b/src/plugins/platforms/eglfs/qeglfsscreen.h index 66e600d7c2..8c67bf1956 100644 --- a/src/plugins/platforms/eglfs/qeglfsscreen.h +++ b/src/plugins/platforms/eglfs/qeglfsscreen.h @@ -42,7 +42,7 @@ #ifndef QEGLFSSCREEN_H #define QEGLFSSCREEN_H -#include <QPlatformScreen> +#include <qpa/qplatformscreen.h> #include <QtCore/QTextStream> diff --git a/src/plugins/platforms/eglfs/qeglfswindow.h b/src/plugins/platforms/eglfs/qeglfswindow.h index 7f40c78550..3e7a68953a 100644 --- a/src/plugins/platforms/eglfs/qeglfswindow.h +++ b/src/plugins/platforms/eglfs/qeglfswindow.h @@ -45,7 +45,7 @@ #include "qeglfsintegration.h" #include "qeglfsscreen.h" -#include <QPlatformWindow> +#include <qpa/qplatformwindow.h> #include <QtWidgets/QWidget> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/kms/main.cpp b/src/plugins/platforms/kms/main.cpp index 422fc5fba6..c1baaf3a4e 100644 --- a/src/plugins/platforms/kms/main.cpp +++ b/src/plugins/platforms/kms/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtGui/QPlatformIntegrationPlugin> +#include <qpa/qplatformintegrationplugin.h> #include "qkmsintegration.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/kms/qkmsbackingstore.h b/src/plugins/platforms/kms/qkmsbackingstore.h index ab276fa753..59d9c9ad94 100644 --- a/src/plugins/platforms/kms/qkmsbackingstore.h +++ b/src/plugins/platforms/kms/qkmsbackingstore.h @@ -42,7 +42,7 @@ #ifndef QBACKINGSTORE_KMS_H #define QBACKINGSTORE_KMS_H -#include <QtGui/QPlatformBackingStore> +#include <qpa/qplatformbackingstore.h> #include <QImage> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/kms/qkmscontext.h b/src/plugins/platforms/kms/qkmscontext.h index 6378780f34..32223ada51 100644 --- a/src/plugins/platforms/kms/qkmscontext.h +++ b/src/plugins/platforms/kms/qkmscontext.h @@ -42,7 +42,7 @@ #ifndef QKMSCONTEXT_H #define QKMSCONTEXT_H -#include <QtGui/QPlatformOpenGLContext> +#include <qpa/qplatformopenglcontext.h> #define EGL_EGLEXT_PROTOTYPES 1 #include <EGL/egl.h> diff --git a/src/plugins/platforms/kms/qkmscursor.h b/src/plugins/platforms/kms/qkmscursor.h index f6e1176a36..c0734eb68a 100644 --- a/src/plugins/platforms/kms/qkmscursor.h +++ b/src/plugins/platforms/kms/qkmscursor.h @@ -42,7 +42,7 @@ #ifndef QKMSCURSOR_H #define QKMSCURSOR_H -#include <QtGui/QPlatformCursor> +#include <qpa/qplatformcursor.h> #define EGL_EGLEXT_PROTOTYPES 1 diff --git a/src/plugins/platforms/kms/qkmsintegration.h b/src/plugins/platforms/kms/qkmsintegration.h index 03fc5080a6..93b3084e9b 100644 --- a/src/plugins/platforms/kms/qkmsintegration.h +++ b/src/plugins/platforms/kms/qkmsintegration.h @@ -42,8 +42,8 @@ #ifndef QPLATFORMINTEGRATION_KMS_H #define QPLATFORMINTEGRATION_KMS_H -#include <QtGui/QPlatformIntegration> -#include <QtGui/QPlatformNativeInterface> +#include <qpa/qplatformintegration.h> +#include <qpa/qplatformnativeinterface.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/kms/qkmsnativeinterface.h b/src/plugins/platforms/kms/qkmsnativeinterface.h index 77a9573250..20949becba 100644 --- a/src/plugins/platforms/kms/qkmsnativeinterface.h +++ b/src/plugins/platforms/kms/qkmsnativeinterface.h @@ -44,7 +44,7 @@ #include "qkmsscreen.h" -#include <QtGui/QPlatformNativeInterface> +#include <qpa/qplatformnativeinterface.h> class QKmsNativeInterface : public QPlatformNativeInterface { diff --git a/src/plugins/platforms/kms/qkmsscreen.h b/src/plugins/platforms/kms/qkmsscreen.h index 058314a515..e8e6bda22d 100644 --- a/src/plugins/platforms/kms/qkmsscreen.h +++ b/src/plugins/platforms/kms/qkmsscreen.h @@ -42,7 +42,7 @@ #ifndef QKMSSCREEN_H #define QKMSSCREEN_H -#include <QtGui/QPlatformScreen> +#include <qpa/qplatformscreen.h> #include "qkmsbuffermanager.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/kms/qkmswindow.h b/src/plugins/platforms/kms/qkmswindow.h index 2a7839681f..c9b3c2692f 100644 --- a/src/plugins/platforms/kms/qkmswindow.h +++ b/src/plugins/platforms/kms/qkmswindow.h @@ -42,7 +42,7 @@ #ifndef QKMSWINDOW_H #define QKMSWINDOW_H -#include <QtGui/QPlatformWindow> +#include <qpa/qplatformwindow.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/linuxfb/main.cpp b/src/plugins/platforms/linuxfb/main.cpp index 1339700534..f670b6f5d4 100644 --- a/src/plugins/platforms/linuxfb/main.cpp +++ b/src/plugins/platforms/linuxfb/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QPlatformIntegrationPlugin> +#include <qpa/qplatformintegrationplugin.h> #include "qlinuxfbintegration.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/linuxfb/qlinuxfbintegration.h b/src/plugins/platforms/linuxfb/qlinuxfbintegration.h index 3c8f03374a..200cd81bd4 100644 --- a/src/plugins/platforms/linuxfb/qlinuxfbintegration.h +++ b/src/plugins/platforms/linuxfb/qlinuxfbintegration.h @@ -42,7 +42,7 @@ #ifndef QGRAPHICSSYSTEM_LINUXFB_H #define QGRAPHICSSYSTEM_LINUXFB_H -#include <QPlatformIntegration> +#include <qpa/qplatformintegration.h> #include "../fb_base/fb_base.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/minimal/main.cpp b/src/plugins/platforms/minimal/main.cpp index 8a6e8fb4b0..9ac75e1050 100644 --- a/src/plugins/platforms/minimal/main.cpp +++ b/src/plugins/platforms/minimal/main.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ -#include <QtGui/QPlatformIntegrationPlugin> +#include <qpa/qplatformintegrationplugin.h> #include "qminimalintegration.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/minimal/qminimalbackingstore.cpp b/src/plugins/platforms/minimal/qminimalbackingstore.cpp index 5336dbf3bd..d47633e673 100644 --- a/src/plugins/platforms/minimal/qminimalbackingstore.cpp +++ b/src/plugins/platforms/minimal/qminimalbackingstore.cpp @@ -43,7 +43,7 @@ #include "qminimalbackingstore.h" #include "qscreen.h" #include <QtCore/qdebug.h> -#include <QtGui/QPlatformScreen> +#include <qpa/qplatformscreen.h> #include <private/qguiapplication_p.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/minimal/qminimalbackingstore.h b/src/plugins/platforms/minimal/qminimalbackingstore.h index 375edaa2f3..ff670f5eb2 100644 --- a/src/plugins/platforms/minimal/qminimalbackingstore.h +++ b/src/plugins/platforms/minimal/qminimalbackingstore.h @@ -42,8 +42,8 @@ #ifndef QBACKINGSTORE_MINIMAL_H #define QBACKINGSTORE_MINIMAL_H -#include <QtGui/QPlatformBackingStore> -#include <QtGui/QPlatformWindow> +#include <qpa/qplatformbackingstore.h> +#include <qpa/qplatformwindow.h> #include <QtGui/QImage> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp index 874f270f42..3ad5f6e309 100644 --- a/src/plugins/platforms/minimal/qminimalintegration.cpp +++ b/src/plugins/platforms/minimal/qminimalintegration.cpp @@ -49,7 +49,7 @@ #include <QtGui/private/qpixmap_raster_p.h> #include <QtGui/private/qguiapplication_p.h> -#include <QtGui/QPlatformWindow> +#include <qpa/qplatformwindow.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/minimal/qminimalintegration.h b/src/plugins/platforms/minimal/qminimalintegration.h index 2b345e009e..7d9db08f3d 100644 --- a/src/plugins/platforms/minimal/qminimalintegration.h +++ b/src/plugins/platforms/minimal/qminimalintegration.h @@ -42,8 +42,8 @@ #ifndef QPLATFORMINTEGRATION_MINIMAL_H #define QPLATFORMINTEGRATION_MINIMAL_H -#include <QtGui/QPlatformIntegration> -#include <QtGui/QPlatformScreen> +#include <qpa/qplatformintegration.h> +#include <qpa/qplatformscreen.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/openwfd/main.cpp b/src/plugins/platforms/openwfd/main.cpp index 4e583e9b2d..0d9508da6c 100644 --- a/src/plugins/platforms/openwfd/main.cpp +++ b/src/plugins/platforms/openwfd/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtGui/QPlatformIntegrationPlugin> +#include <qpa/qplatformintegrationplugin.h> #include "qopenwfdintegration.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/openwfd/qopenwfdbackingstore.h b/src/plugins/platforms/openwfd/qopenwfdbackingstore.h index 4002fd8ffc..84caa81f97 100644 --- a/src/plugins/platforms/openwfd/qopenwfdbackingstore.h +++ b/src/plugins/platforms/openwfd/qopenwfdbackingstore.h @@ -42,7 +42,7 @@ #ifndef QOPENWFDBACKINGSTORE_H #define QOPENWFDBACKINGSTORE_H -#include <QtGui/QPlatformBackingStore> +#include <qpa/qplatformbackingstore.h> #include <QtGui/QImage> class QOpenWFDBackingStore : public QPlatformBackingStore diff --git a/src/plugins/platforms/openwfd/qopenwfdglcontext.h b/src/plugins/platforms/openwfd/qopenwfdglcontext.h index d353eddbb0..7a613cc8a7 100644 --- a/src/plugins/platforms/openwfd/qopenwfdglcontext.h +++ b/src/plugins/platforms/openwfd/qopenwfdglcontext.h @@ -42,7 +42,7 @@ #ifndef QOPENWFDGLCONTEXT_H #define QOPENWFDGLCONTEXT_H -#include <QtGui/QPlatformOpenGLContext> +#include <qpa/qplatformopenglcontext.h> #include "qopenwfddevice.h" diff --git a/src/plugins/platforms/openwfd/qopenwfdintegration.h b/src/plugins/platforms/openwfd/qopenwfdintegration.h index 5737dbb00e..7b6a95497f 100644 --- a/src/plugins/platforms/openwfd/qopenwfdintegration.h +++ b/src/plugins/platforms/openwfd/qopenwfdintegration.h @@ -42,8 +42,8 @@ #ifndef QOPENWFDINTEGRATION_H #define QOPENWFDINTEGRATION_H -#include <QtGui/QPlatformIntegration> -#include <QtGui/QPlatformScreen> +#include <qpa/qplatformintegration.h> +#include <qpa/qplatformscreen.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/openwfd/qopenwfdnativeinterface.h b/src/plugins/platforms/openwfd/qopenwfdnativeinterface.h index 955fca7d41..f4ccfe5958 100644 --- a/src/plugins/platforms/openwfd/qopenwfdnativeinterface.h +++ b/src/plugins/platforms/openwfd/qopenwfdnativeinterface.h @@ -42,7 +42,7 @@ #ifndef QOPENWFDNATIVEINTERFACE_H #define QOPENWFDNATIVEINTERFACE_H -#include <QtGui/QPlatformNativeInterface> +#include <qpa/qplatformnativeinterface.h> #include <WF/wfdplatform.h> diff --git a/src/plugins/platforms/openwfd/qopenwfdscreen.h b/src/plugins/platforms/openwfd/qopenwfdscreen.h index 8993205a16..ff4a83f663 100644 --- a/src/plugins/platforms/openwfd/qopenwfdscreen.h +++ b/src/plugins/platforms/openwfd/qopenwfdscreen.h @@ -42,7 +42,7 @@ #ifndef QOPENWFDSCREEN_H #define QOPENWFDSCREEN_H -#include <QtGui/QPlatformScreen> +#include <qpa/qplatformscreen.h> #include "qopenwfdoutputbuffer.h" diff --git a/src/plugins/platforms/openwfd/qopenwfdwindow.h b/src/plugins/platforms/openwfd/qopenwfdwindow.h index ca531b07ae..9f777b3c4a 100644 --- a/src/plugins/platforms/openwfd/qopenwfdwindow.h +++ b/src/plugins/platforms/openwfd/qopenwfdwindow.h @@ -42,7 +42,7 @@ #ifndef QOPENWFDWINDOW_H #define QOPENWFDWINDOW_H -#include <QtGui/QPlatformWindow> +#include <qpa/qplatformwindow.h> #include <QtCore/QVarLengthArray> #include "qopenwfdport.h" diff --git a/src/plugins/platforms/qnx/main.h b/src/plugins/platforms/qnx/main.h index cc2cfdd000..4033a29121 100644 --- a/src/plugins/platforms/qnx/main.h +++ b/src/plugins/platforms/qnx/main.h @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtGui/QPlatformIntegrationPlugin> +#include <qpa/qplatformintegrationplugin.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/qnx/qqnxclipboard.h b/src/plugins/platforms/qnx/qqnxclipboard.h index c9ceff41f6..7a9d7c3121 100644 --- a/src/plugins/platforms/qnx/qqnxclipboard.h +++ b/src/plugins/platforms/qnx/qqnxclipboard.h @@ -43,7 +43,7 @@ #define QQNXCLIPBOARD_H #ifndef QT_NO_CLIPBOARD -#include <QtGui/QPlatformClipboard> +#include <qpa/qplatformclipboard.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/qnx/qqnxglbackingstore.h b/src/plugins/platforms/qnx/qqnxglbackingstore.h index b694079f37..78ee58f215 100644 --- a/src/plugins/platforms/qnx/qqnxglbackingstore.h +++ b/src/plugins/platforms/qnx/qqnxglbackingstore.h @@ -42,7 +42,7 @@ #ifndef QQNXGLBACKINGSTORE_H #define QQNXGLBACKINGSTORE_H -#include <QtGui/qplatformbackingstore_qpa.h> +#include <qpa/qplatformbackingstore.h> #include <QtOpenGL/private/qglpaintdevice_p.h> #include <screen/screen.h> diff --git a/src/plugins/platforms/qnx/qqnxglcontext.h b/src/plugins/platforms/qnx/qqnxglcontext.h index ee8d61ce00..8b587e7eb8 100644 --- a/src/plugins/platforms/qnx/qqnxglcontext.h +++ b/src/plugins/platforms/qnx/qqnxglcontext.h @@ -42,7 +42,7 @@ #ifndef QQNXGLCONTEXT_H #define QQNXGLCONTEXT_H -#include <QtGui/QPlatformOpenGLContext> +#include <qpa/qplatformopenglcontext.h> #include <QtGui/QSurfaceFormat> #include <QtCore/QSize> diff --git a/src/plugins/platforms/qnx/qqnxinputcontext_imf.h b/src/plugins/platforms/qnx/qqnxinputcontext_imf.h index 5f7d95bc4a..f6f0f60204 100644 --- a/src/plugins/platforms/qnx/qqnxinputcontext_imf.h +++ b/src/plugins/platforms/qnx/qqnxinputcontext_imf.h @@ -42,11 +42,11 @@ #ifndef QQNXINPUTCONTEXT_H #define QQNXINPUTCONTEXT_H -#include <QtGui/QPlatformInputContext> +#include <qpa/qplatforminputcontext.h> #include <QtCore/QLocale> #include <QtCore/QMetaType> -#include <QtGui/QPlatformIntegration> +#include <qpa/qplatformintegration.h> #include "imf/imf_client.h" #include "imf/input_control.h" diff --git a/src/plugins/platforms/qnx/qqnxinputcontext_noimf.h b/src/plugins/platforms/qnx/qqnxinputcontext_noimf.h index d73c5136b5..93512b26e5 100644 --- a/src/plugins/platforms/qnx/qqnxinputcontext_noimf.h +++ b/src/plugins/platforms/qnx/qqnxinputcontext_noimf.h @@ -43,8 +43,8 @@ #define QQNXINPUTCONTEXT_H #include <QtCore/QLocale> -#include <QtGui/QPlatformInputContext> -#include <QtGui/QPlatformIntegration> +#include <qpa/qplatforminputcontext.h> +#include <qpa/qplatformintegration.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/qnx/qqnxintegration.cpp b/src/plugins/platforms/qnx/qqnxintegration.cpp index 73d8cb2007..dd1a6f8b7e 100644 --- a/src/plugins/platforms/qnx/qqnxintegration.cpp +++ b/src/plugins/platforms/qnx/qqnxintegration.cpp @@ -79,7 +79,7 @@ #include "private/qgenericunixeventdispatcher_p.h" #endif -#include <QtGui/QPlatformWindow> +#include <qpa/qplatformwindow.h> #include <QtGui/QWindowSystemInterface> #if !defined(QT_NO_OPENGL) diff --git a/src/plugins/platforms/qnx/qqnxintegration.h b/src/plugins/platforms/qnx/qqnxintegration.h index a3c476f16e..e0da8cc5f2 100644 --- a/src/plugins/platforms/qnx/qqnxintegration.h +++ b/src/plugins/platforms/qnx/qqnxintegration.h @@ -42,7 +42,7 @@ #ifndef QQNXINTEGRATION_H #define QQNXINTEGRATION_H -#include <QtGui/qplatformintegration_qpa.h> +#include <qpa/qplatformintegration.h> #include <QtCore/qmutex.h> diff --git a/src/plugins/platforms/qnx/qqnxnativeinterface.h b/src/plugins/platforms/qnx/qqnxnativeinterface.h index ec896d40fa..f176b0a538 100644 --- a/src/plugins/platforms/qnx/qqnxnativeinterface.h +++ b/src/plugins/platforms/qnx/qqnxnativeinterface.h @@ -42,7 +42,7 @@ #ifndef QQNXNATIVEINTERFACE_H #define QQNXNATIVEINTERFACE_H -#include <QtGui/QPlatformNativeInterface> +#include <qpa/qplatformnativeinterface.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/qnx/qqnxrasterbackingstore.h b/src/plugins/platforms/qnx/qqnxrasterbackingstore.h index 7a7f211e9a..6a559492e1 100644 --- a/src/plugins/platforms/qnx/qqnxrasterbackingstore.h +++ b/src/plugins/platforms/qnx/qqnxrasterbackingstore.h @@ -42,7 +42,7 @@ #ifndef QQNXRASTERWINDOWSURFACE_H #define QQNXRASTERWINDOWSURFACE_H -#include <QtGui/qplatformbackingstore_qpa.h> +#include <qpa/qplatformbackingstore.h> #include <screen/screen.h> diff --git a/src/plugins/platforms/qnx/qqnxscreen.h b/src/plugins/platforms/qnx/qqnxscreen.h index 7816661323..4a13946ec3 100644 --- a/src/plugins/platforms/qnx/qqnxscreen.h +++ b/src/plugins/platforms/qnx/qqnxscreen.h @@ -42,7 +42,7 @@ #ifndef QBBSCREEN_H #define QBBSCREEN_H -#include <QtGui/QPlatformScreen> +#include <qpa/qplatformscreen.h> #include "qqnxrootwindow.h" diff --git a/src/plugins/platforms/qnx/qqnxservices.h b/src/plugins/platforms/qnx/qqnxservices.h index fe7c014047..e9fc7cf2e5 100644 --- a/src/plugins/platforms/qnx/qqnxservices.h +++ b/src/plugins/platforms/qnx/qqnxservices.h @@ -42,7 +42,7 @@ #ifndef QQNXSERVICES_H #define QQNXSERVICES_H -#include <QtGui/QPlatformServices> +#include <qpa/qplatformservices.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/qnx/qqnxwindow.h b/src/plugins/platforms/qnx/qqnxwindow.h index 2ea7bbca51..50b9a423f5 100644 --- a/src/plugins/platforms/qnx/qqnxwindow.h +++ b/src/plugins/platforms/qnx/qqnxwindow.h @@ -42,7 +42,7 @@ #ifndef QQNXWINDOW_H #define QQNXWINDOW_H -#include <QtGui/QPlatformWindow> +#include <qpa/qplatformwindow.h> #include "qqnxbuffer.h" diff --git a/src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp b/src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp index 17ee6eb82c..6f2a601c50 100644 --- a/src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp +++ b/src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp @@ -51,7 +51,7 @@ #include <QtCore/qsettings.h> #include <QtGui/qaccessible.h> #include <QtGui/qaccessible2.h> -#include <QtGui/qplatformnativeinterface_qpa.h> +#include <qpa/qplatformnativeinterface.h> #include <QtGui/qwindow.h> #include <QtGui/qguiapplication.h> diff --git a/src/plugins/platforms/windows/accessible/qwindowsaccessibility.h b/src/plugins/platforms/windows/accessible/qwindowsaccessibility.h index 3366c32daa..67aaa5b993 100644 --- a/src/plugins/platforms/windows/accessible/qwindowsaccessibility.h +++ b/src/plugins/platforms/windows/accessible/qwindowsaccessibility.h @@ -44,7 +44,7 @@ #include "../qtwindowsglobal.h" #include "../qwindowscontext.h" -#include <QtGui/QPlatformAccessibility> +#include <qpa/qplatformaccessibility.h> #include <oleacc.h> diff --git a/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp b/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp index 5003d9effd..fafe624e4b 100644 --- a/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp +++ b/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp @@ -56,7 +56,7 @@ #include <QtGui/qaccessible.h> #include <QtGui/qaccessible2.h> #include <QtGui/qguiapplication.h> -#include <QtGui/qplatformnativeinterface_qpa.h> +#include <qpa/qplatformnativeinterface.h> #include <QtGui/qwindow.h> #include <QtWidgets/qapplication.h> #include <QtWidgets/qgraphicsitem.h> diff --git a/src/plugins/platforms/windows/main.cpp b/src/plugins/platforms/windows/main.cpp index 9f6ce99836..5404d91679 100644 --- a/src/plugins/platforms/windows/main.cpp +++ b/src/plugins/platforms/windows/main.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ -#include <QtGui/QPlatformIntegrationPlugin> +#include <qpa/qplatformintegrationplugin.h> #include <QtCore/QStringList> #include "qwindowsintegration.h" diff --git a/src/plugins/platforms/windows/qwindowsbackingstore.h b/src/plugins/platforms/windows/qwindowsbackingstore.h index 14ce6c3438..75b6e5f736 100644 --- a/src/plugins/platforms/windows/qwindowsbackingstore.h +++ b/src/plugins/platforms/windows/qwindowsbackingstore.h @@ -44,7 +44,7 @@ #include "qtwindows_additional.h" -#include <QtGui/QPlatformBackingStore> +#include <qpa/qplatformbackingstore.h> #include <QtCore/QScopedPointer> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/windows/qwindowsclipboard.h b/src/plugins/platforms/windows/qwindowsclipboard.h index 643c785e8b..00c975eae6 100644 --- a/src/plugins/platforms/windows/qwindowsclipboard.h +++ b/src/plugins/platforms/windows/qwindowsclipboard.h @@ -44,7 +44,7 @@ #include "qwindowsinternalmimedata.h" -#include <QtGui/QPlatformClipboard> +#include <qpa/qplatformclipboard.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/windows/qwindowscontext.cpp b/src/plugins/platforms/windows/qwindowscontext.cpp index 4d284e0591..3a2113520d 100644 --- a/src/plugins/platforms/windows/qwindowscontext.cpp +++ b/src/plugins/platforms/windows/qwindowscontext.cpp @@ -55,7 +55,7 @@ #include <QtGui/QWindow> #include <QtGui/QWindowSystemInterface> -#include <QtGui/QPlatformNativeInterface> +#include <qpa/qplatformnativeinterface.h> #include <QtGui/QGuiApplication> #include <QtCore/QSet> diff --git a/src/plugins/platforms/windows/qwindowscursor.h b/src/plugins/platforms/windows/qwindowscursor.h index 61c43dc4d2..c1bccde46c 100644 --- a/src/plugins/platforms/windows/qwindowscursor.h +++ b/src/plugins/platforms/windows/qwindowscursor.h @@ -44,7 +44,7 @@ #include "qtwindows_additional.h" -#include <QtGui/QPlatformCursor> +#include <qpa/qplatformcursor.h> #include <QtCore/QSharedDataPointer> #include <QtCore/QHash> diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.h b/src/plugins/platforms/windows/qwindowsdialoghelpers.h index 909ce5984e..285c58dc5f 100644 --- a/src/plugins/platforms/windows/qwindowsdialoghelpers.h +++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.h @@ -43,8 +43,8 @@ #define QWINDOWSDIALOGHELPER_H #include "qtwindows_additional.h" -#include <QtGui/QPlatformDialogHelper> -#include <QtGui/QPlatformTheme> +#include <qpa/qplatformdialoghelper.h> +#include <qpa/qplatformtheme.h> #include <QtCore/QStringList> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/windows/qwindowsdrag.h b/src/plugins/platforms/windows/qwindowsdrag.h index 7b629baccc..867093ab60 100644 --- a/src/plugins/platforms/windows/qwindowsdrag.h +++ b/src/plugins/platforms/windows/qwindowsdrag.h @@ -44,7 +44,7 @@ #include "qwindowsinternalmimedata.h" -#include <QtGui/QPlatformDrag> +#include <qpa/qplatformdrag.h> #include <QtGui/QPixmap> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase.h b/src/plugins/platforms/windows/qwindowsfontdatabase.h index f442f492aa..6441e79177 100644 --- a/src/plugins/platforms/windows/qwindowsfontdatabase.h +++ b/src/plugins/platforms/windows/qwindowsfontdatabase.h @@ -42,7 +42,7 @@ #ifndef QWINDOWSFONTDATABASE_H #define QWINDOWSFONTDATABASE_H -#include <QtGui/QPlatformFontDatabase> +#include <qpa/qplatformfontdatabase.h> #include <QtCore/QSharedPointer> #include "qtwindows_additional.h" diff --git a/src/plugins/platforms/windows/qwindowsglcontext.cpp b/src/plugins/platforms/windows/qwindowsglcontext.cpp index f16a0ca73d..607dabc966 100644 --- a/src/plugins/platforms/windows/qwindowsglcontext.cpp +++ b/src/plugins/platforms/windows/qwindowsglcontext.cpp @@ -46,7 +46,7 @@ #include <QtCore/QDebug> #include <QtCore/QSysInfo> #include <QtGui/QGuiApplication> -#include <QtGui/QPlatformNativeInterface> +#include <qpa/qplatformnativeinterface.h> #include <wingdi.h> #include <GL/gl.h> diff --git a/src/plugins/platforms/windows/qwindowsglcontext.h b/src/plugins/platforms/windows/qwindowsglcontext.h index a0489e2d02..b83a57d13a 100644 --- a/src/plugins/platforms/windows/qwindowsglcontext.h +++ b/src/plugins/platforms/windows/qwindowsglcontext.h @@ -45,7 +45,7 @@ #include "array.h" #include "qtwindows_additional.h" -#include <QtGui/QPlatformOpenGLContext> +#include <qpa/qplatformopenglcontext.h> #include <QtGui/QOpenGLContext> #include <QtCore/QSharedPointer> diff --git a/src/plugins/platforms/windows/qwindowsinputcontext.h b/src/plugins/platforms/windows/qwindowsinputcontext.h index 610bad08dd..134dfdbd2e 100644 --- a/src/plugins/platforms/windows/qwindowsinputcontext.h +++ b/src/plugins/platforms/windows/qwindowsinputcontext.h @@ -44,7 +44,7 @@ #include "qtwindows_additional.h" -#include <QtGui/QPlatformInputContext> +#include <qpa/qplatforminputcontext.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp index 45f6ecf652..69ae653f5b 100644 --- a/src/plugins/platforms/windows/qwindowsintegration.cpp +++ b/src/plugins/platforms/windows/qwindowsintegration.cpp @@ -60,7 +60,7 @@ #include "accessible/qwindowsaccessibility.h" #endif -#include <QtGui/QPlatformNativeInterface> +#include <qpa/qplatformnativeinterface.h> #include <QtGui/QWindowSystemInterface> #include <QtGui/QBackingStore> #include <QtGui/private/qpixmap_raster_p.h> diff --git a/src/plugins/platforms/windows/qwindowsintegration.h b/src/plugins/platforms/windows/qwindowsintegration.h index 84bbf6103a..76393be402 100644 --- a/src/plugins/platforms/windows/qwindowsintegration.h +++ b/src/plugins/platforms/windows/qwindowsintegration.h @@ -42,7 +42,7 @@ #ifndef QWINDOWSINTEGRATION_H #define QWINDOWSINTEGRATION_H -#include <QtGui/QPlatformIntegration> +#include <qpa/qplatformintegration.h> #include <QtCore/QScopedPointer> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/windows/qwindowsscreen.h b/src/plugins/platforms/windows/qwindowsscreen.h index 5b9a50b2ab..56e9ab304e 100644 --- a/src/plugins/platforms/windows/qwindowsscreen.h +++ b/src/plugins/platforms/windows/qwindowsscreen.h @@ -47,7 +47,7 @@ #include <QtCore/QList> #include <QtCore/QPair> #include <QtCore/QSharedPointer> -#include <QtGui/QPlatformScreen> +#include <qpa/qplatformscreen.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/windows/qwindowsservices.h b/src/plugins/platforms/windows/qwindowsservices.h index d979ed1af1..c9954b5257 100644 --- a/src/plugins/platforms/windows/qwindowsservices.h +++ b/src/plugins/platforms/windows/qwindowsservices.h @@ -42,7 +42,7 @@ #ifndef QWINDOWSDESKTOPSERVICES_H #define QWINDOWSDESKTOPSERVICES_H -#include <QtGui/qplatformservices_qpa.h> +#include <qpa/qplatformservices.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/windows/qwindowstheme.h b/src/plugins/platforms/windows/qwindowstheme.h index 7515a13a72..223a98caf5 100644 --- a/src/plugins/platforms/windows/qwindowstheme.h +++ b/src/plugins/platforms/windows/qwindowstheme.h @@ -42,7 +42,7 @@ #ifndef QWINDOWSTHEME_H #define QWINDOWSTHEME_H -#include <QtGui/QPlatformTheme> +#include <qpa/qplatformtheme.h> #include <QtGui/QColor> #include "qtwindows_additional.h" diff --git a/src/plugins/platforms/windows/qwindowswindow.h b/src/plugins/platforms/windows/qwindowswindow.h index badc229718..87c22c76d1 100644 --- a/src/plugins/platforms/windows/qwindowswindow.h +++ b/src/plugins/platforms/windows/qwindowswindow.h @@ -45,7 +45,7 @@ #include "qtwindows_additional.h" #include "qwindowscursor.h" -#include <QtGui/QPlatformWindow> +#include <qpa/qplatformwindow.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/xcb/main.cpp b/src/plugins/platforms/xcb/main.cpp index 50c5a1a017..4474a474fd 100644 --- a/src/plugins/platforms/xcb/main.cpp +++ b/src/plugins/platforms/xcb/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtGui/QPlatformIntegrationPlugin> +#include <qpa/qplatformintegrationplugin.h> #include "qxcbintegration.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/xcb/qdri2context.h b/src/plugins/platforms/xcb/qdri2context.h index d0a1b469a9..8945744b22 100644 --- a/src/plugins/platforms/xcb/qdri2context.h +++ b/src/plugins/platforms/xcb/qdri2context.h @@ -42,7 +42,7 @@ #ifndef QDRI2CONTEXT_H #define QDRI2CONTEXT_H -#include <QtGui/QPlatformOpenGLContext> +#include <qpa/qplatformopenglcontext.h> struct xcb_dri2_dri2_buffer_t; diff --git a/src/plugins/platforms/xcb/qglxintegration.h b/src/plugins/platforms/xcb/qglxintegration.h index dce9193eba..8d114b75db 100644 --- a/src/plugins/platforms/xcb/qglxintegration.h +++ b/src/plugins/platforms/xcb/qglxintegration.h @@ -45,7 +45,7 @@ #include "qxcbwindow.h" #include "qxcbscreen.h" -#include <QtGui/QPlatformOpenGLContext> +#include <qpa/qplatformopenglcontext.h> #include <QtGui/QSurfaceFormat> #include <QtCore/QMutex> diff --git a/src/plugins/platforms/xcb/qxcbbackingstore.h b/src/plugins/platforms/xcb/qxcbbackingstore.h index e02c6eb15b..b66a27470e 100644 --- a/src/plugins/platforms/xcb/qxcbbackingstore.h +++ b/src/plugins/platforms/xcb/qxcbbackingstore.h @@ -42,7 +42,7 @@ #ifndef QXCBBACKINGSTORE_H #define QXCBBACKINGSTORE_H -#include <qplatformbackingstore_qpa.h> +#include <qpa/qplatformbackingstore.h> #include <xcb/xcb.h> diff --git a/src/plugins/platforms/xcb/qxcbclipboard.h b/src/plugins/platforms/xcb/qxcbclipboard.h index a43518e80b..1b3f12b279 100644 --- a/src/plugins/platforms/xcb/qxcbclipboard.h +++ b/src/plugins/platforms/xcb/qxcbclipboard.h @@ -42,7 +42,7 @@ #ifndef QXCBCLIPBOARD_H #define QXCBCLIPBOARD_H -#include <QPlatformClipboard> +#include <qpa/qplatformclipboard.h> #include <qxcbobject.h> #include <xcb/xcb.h> #include <xcb/xfixes.h> diff --git a/src/plugins/platforms/xcb/qxcbcursor.h b/src/plugins/platforms/xcb/qxcbcursor.h index da243424d5..80fb88b39d 100644 --- a/src/plugins/platforms/xcb/qxcbcursor.h +++ b/src/plugins/platforms/xcb/qxcbcursor.h @@ -42,7 +42,7 @@ #ifndef QXCBCURSOR_H #define QXCBCURSOR_H -#include <QtGui/QPlatformCursor> +#include <qpa/qplatformcursor.h> #include "qxcbscreen.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/xcb/qxcbdrag.h b/src/plugins/platforms/xcb/qxcbdrag.h index 710a07a5a4..2f74b3eaf7 100644 --- a/src/plugins/platforms/xcb/qxcbdrag.h +++ b/src/plugins/platforms/xcb/qxcbdrag.h @@ -42,7 +42,7 @@ #ifndef QXCBDRAG_H #define QXCBDRAG_H -#include <qplatformdrag_qpa.h> +#include <qpa/qplatformdrag.h> #include <QtPlatformSupport/private/qsimpledrag_p.h> #include <qxcbobject.h> #include <xcb/xcb.h> diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp index 2d3971de69..8dba6e1464 100644 --- a/src/plugins/platforms/xcb/qxcbintegration.cpp +++ b/src/plugins/platforms/xcb/qxcbintegration.cpp @@ -68,9 +68,9 @@ #include <X11/Xlib.h> #endif -#include <private/qplatforminputcontextfactory_qpa_p.h> +#include <qpa/qplatforminputcontextfactory_p.h> #include <private/qgenericunixthemes_p.h> -#include <qplatforminputcontext_qpa.h> +#include <qpa/qplatforminputcontext.h> #if defined(XCB_USE_GLX) #include "qglxintegration.h" @@ -82,7 +82,7 @@ #include <QtGui/QOpenGLContext> #include <QtGui/QScreen> #ifndef QT_NO_ACCESSIBILITY -#include <QtGui/QPlatformAccessibility> +#include <qpa/qplatformaccessibility.h> #endif QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/xcb/qxcbintegration.h b/src/plugins/platforms/xcb/qxcbintegration.h index 6170232d1e..b2245e4de0 100644 --- a/src/plugins/platforms/xcb/qxcbintegration.h +++ b/src/plugins/platforms/xcb/qxcbintegration.h @@ -42,8 +42,8 @@ #ifndef QXCBINTEGRATION_H #define QXCBINTEGRATION_H -#include <QtGui/QPlatformIntegration> -#include <QtGui/QPlatformScreen> +#include <qpa/qplatformintegration.h> +#include <qpa/qplatformscreen.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/xcb/qxcbkeyboard.cpp b/src/plugins/platforms/xcb/qxcbkeyboard.cpp index ef98f82e97..9bd4c9ccdf 100644 --- a/src/plugins/platforms/xcb/qxcbkeyboard.cpp +++ b/src/plugins/platforms/xcb/qxcbkeyboard.cpp @@ -49,8 +49,8 @@ #include <private/qguiapplication_p.h> #include <stdio.h> -#include <qplatforminputcontext_qpa.h> -#include <qplatformintegration_qpa.h> +#include <qpa/qplatforminputcontext.h> +#include <qpa/qplatformintegration.h> #ifndef XK_ISO_Left_Tab #define XK_ISO_Left_Tab 0xFE20 diff --git a/src/plugins/platforms/xcb/qxcbnativeinterface.h b/src/plugins/platforms/xcb/qxcbnativeinterface.h index c6835ff9e0..354ef76799 100644 --- a/src/plugins/platforms/xcb/qxcbnativeinterface.h +++ b/src/plugins/platforms/xcb/qxcbnativeinterface.h @@ -42,7 +42,7 @@ #ifndef QXCBNATIVEINTERFACE_H #define QXCBNATIVEINTERFACE_H -#include <QtGui/QPlatformNativeInterface> +#include <qpa/qplatformnativeinterface.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/xcb/qxcbscreen.h b/src/plugins/platforms/xcb/qxcbscreen.h index ac4ecb1c8d..ba3f4aff8d 100644 --- a/src/plugins/platforms/xcb/qxcbscreen.h +++ b/src/plugins/platforms/xcb/qxcbscreen.h @@ -42,7 +42,7 @@ #ifndef QXCBSCREEN_H #define QXCBSCREEN_H -#include <QtGui/QPlatformScreen> +#include <qpa/qplatformscreen.h> #include <QtCore/QString> #include <xcb/xcb.h> diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp index ffce2f3956..2355043c56 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.cpp +++ b/src/plugins/platforms/xcb/qxcbwindow.cpp @@ -50,7 +50,7 @@ #include "qxcbkeyboard.h" #include "qxcbwmsupport.h" -#include <qplatformintegration_qpa.h> +#include <qpa/qplatformintegration.h> #ifdef XCB_USE_DRI2 #include "qdri2context.h" @@ -87,7 +87,7 @@ #include <private/qguiapplication_p.h> #include <private/qwindow_p.h> -#include <QtGui/QPlatformBackingStore> +#include <qpa/qplatformbackingstore.h> #include <QtGui/QWindowSystemInterface> #include <stdio.h> diff --git a/src/plugins/platforms/xcb/qxcbwindow.h b/src/plugins/platforms/xcb/qxcbwindow.h index 523dd559c1..0b82196c27 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.h +++ b/src/plugins/platforms/xcb/qxcbwindow.h @@ -42,7 +42,7 @@ #ifndef QXCBWINDOW_H #define QXCBWINDOW_H -#include <QtGui/QPlatformWindow> +#include <qpa/qplatformwindow.h> #include <QtGui/QSurfaceFormat> #include <QtGui/QImage> diff --git a/src/plugins/printsupport/cocoa/cocoa.pro b/src/plugins/printsupport/cocoa/cocoa.pro index 353094cbae..477715a8e2 100644 --- a/src/plugins/printsupport/cocoa/cocoa.pro +++ b/src/plugins/printsupport/cocoa/cocoa.pro @@ -2,7 +2,7 @@ TARGET = cocoaprintersupport load(qt_plugin) DESTDIR = $$QT.gui.plugins/printsupport -QT += printsupport +QT += gui-private printsupport-private LIBS += -framework Cocoa SOURCES += main.cpp diff --git a/src/plugins/printsupport/cocoa/main.cpp b/src/plugins/printsupport/cocoa/main.cpp index bc8f2e072c..12918974f3 100644 --- a/src/plugins/printsupport/cocoa/main.cpp +++ b/src/plugins/printsupport/cocoa/main.cpp @@ -41,8 +41,8 @@ #include <QtCore/QMetaMethod> #include <QtGui/QGuiApplication> -#include <QtGui/QPlatformNativeInterface> -#include <QtPrintSupport/QPlatformPrinterSupportPlugin> +#include <qpa/qplatformnativeinterface.h> +#include <qpa/qplatformprintplugin.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/printsupport/windows/main.cpp b/src/plugins/printsupport/windows/main.cpp index e29705a8a7..7ddb89212b 100644 --- a/src/plugins/printsupport/windows/main.cpp +++ b/src/plugins/printsupport/windows/main.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ -#include <QtPrintSupport/qplatformprintplugin_qpa.h> +#include <qpa/qplatformprintplugin.h> #include <QtCore/QStringList> #include "qwindowsprintersupport.h" diff --git a/src/plugins/printsupport/windows/qwindowsprintersupport.h b/src/plugins/printsupport/windows/qwindowsprintersupport.h index 35d794aaea..be8758a1bd 100644 --- a/src/plugins/printsupport/windows/qwindowsprintersupport.h +++ b/src/plugins/printsupport/windows/qwindowsprintersupport.h @@ -43,7 +43,7 @@ #define WINDOWSPRINTERSUPPORT_H #include <QtCore/QList> -#include <QtPrintSupport/QPlatformPrinterSupport> +#include <qpa/qplatformprintersupport.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/printsupport/dialogs/qpagesetupdialog_mac.mm b/src/printsupport/dialogs/qpagesetupdialog_mac.mm index 1dded4f905..3e84423fd8 100644 --- a/src/printsupport/dialogs/qpagesetupdialog_mac.mm +++ b/src/printsupport/dialogs/qpagesetupdialog_mac.mm @@ -46,7 +46,7 @@ #include "qpagesetupdialog.h" #include "qabstractpagesetupdialog_p.h" -#include <QtGui/qplatformnativeinterface_qpa.h> +#include <qpa/qplatformnativeinterface.h> #include <QtPrintSupport/qprintengine.h> QT_USE_NAMESPACE diff --git a/src/printsupport/dialogs/qpagesetupdialog_win.cpp b/src/printsupport/dialogs/qpagesetupdialog_win.cpp index 9d7387edba..cb69d0400f 100644 --- a/src/printsupport/dialogs/qpagesetupdialog_win.cpp +++ b/src/printsupport/dialogs/qpagesetupdialog_win.cpp @@ -47,7 +47,7 @@ #include "../kernel/qprintengine_win_p.h" #include "qabstractpagesetupdialog_p.h" #include "qprinter.h" -#include <QtGui/qplatformnativeinterface_qpa.h> +#include <qpa/qplatformnativeinterface.h> QT_BEGIN_NAMESPACE diff --git a/src/printsupport/kernel/kernel.pri b/src/printsupport/kernel/kernel.pri index d7c9f56545..10d9f877a0 100644 --- a/src/printsupport/kernel/kernel.pri +++ b/src/printsupport/kernel/kernel.pri @@ -6,8 +6,8 @@ HEADERS += \ $$PWD/qprinter_p.h \ $$PWD/qprinterinfo.h \ $$PWD/qprinterinfo_p.h \ - $$PWD/qplatformprintplugin_qpa.h \ - $$PWD/qplatformprintersupport_qpa.h + $$PWD/qplatformprintplugin.h \ + $$PWD/qplatformprintersupport.h SOURCES += \ $$PWD/qpaintengine_alpha.cpp \ diff --git a/src/printsupport/kernel/qplatformprintersupport_qpa.h b/src/printsupport/kernel/qplatformprintersupport.h index 5dba56579c..5dba56579c 100644 --- a/src/printsupport/kernel/qplatformprintersupport_qpa.h +++ b/src/printsupport/kernel/qplatformprintersupport.h diff --git a/src/printsupport/kernel/qplatformprintersupport_qpa.cpp b/src/printsupport/kernel/qplatformprintersupport_qpa.cpp index 1ed28b8090..9c0c3f131c 100644 --- a/src/printsupport/kernel/qplatformprintersupport_qpa.cpp +++ b/src/printsupport/kernel/qplatformprintersupport_qpa.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qplatformprintersupport_qpa.h" +#include "qplatformprintersupport.h" #include <QtPrintSupport/qprinterinfo.h> diff --git a/src/printsupport/kernel/qplatformprintplugin.cpp b/src/printsupport/kernel/qplatformprintplugin.cpp index 2c87fcc5e6..ec068d87d1 100644 --- a/src/printsupport/kernel/qplatformprintplugin.cpp +++ b/src/printsupport/kernel/qplatformprintplugin.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qplatformprintplugin_qpa.h" +#include "qplatformprintplugin.h" #include "private/qfactoryloader_p.h" QT_BEGIN_NAMESPACE diff --git a/src/printsupport/kernel/qplatformprintplugin_qpa.h b/src/printsupport/kernel/qplatformprintplugin.h index aec3e02fa6..aec3e02fa6 100644 --- a/src/printsupport/kernel/qplatformprintplugin_qpa.h +++ b/src/printsupport/kernel/qplatformprintplugin.h diff --git a/src/printsupport/kernel/qprintengine_win.cpp b/src/printsupport/kernel/qprintengine_win.cpp index 37d2b27d15..3c079e24f3 100644 --- a/src/printsupport/kernel/qprintengine_win.cpp +++ b/src/printsupport/kernel/qprintengine_win.cpp @@ -54,7 +54,7 @@ #include <qdebug.h> #include <qvector.h> #include <qpicture.h> -#include <qplatformpixmap_qpa.h> +#include <qpa/qplatformpixmap.h> #include <private/qpicture_p.h> #include <private/qpixmap_raster_p.h> diff --git a/src/printsupport/kernel/qprinter.cpp b/src/printsupport/kernel/qprinter.cpp index 6682550849..4929b3308e 100644 --- a/src/printsupport/kernel/qprinter.cpp +++ b/src/printsupport/kernel/qprinter.cpp @@ -52,8 +52,8 @@ #ifndef QT_NO_PRINTER -#include "qplatformprintplugin_qpa.h" -#include <QtPrintSupport/QPlatformPrinterSupport> +#include <qpa/qplatformprintplugin.h> +#include <qpa/qplatformprintersupport.h> #include <private/qpagedpaintdevice_p.h> #if defined(Q_WS_X11) diff --git a/src/printsupport/kernel/qprinterinfo.cpp b/src/printsupport/kernel/qprinterinfo.cpp index 8d498a7e59..3d0ba7f31d 100644 --- a/src/printsupport/kernel/qprinterinfo.cpp +++ b/src/printsupport/kernel/qprinterinfo.cpp @@ -30,8 +30,8 @@ #ifndef QT_NO_PRINTER -#include "qplatformprintplugin_qpa.h" -#include <QtPrintSupport/QPlatformPrinterSupport> +#include <qpa/qplatformprintplugin.h> +#include <qpa/qplatformprintersupport.h> QT_BEGIN_NAMESPACE diff --git a/src/tools/uic/qclass_lib_map.h b/src/tools/uic/qclass_lib_map.h index 34ce374750..825813cc29 100644 --- a/src/tools/uic/qclass_lib_map.h +++ b/src/tools/uic/qclass_lib_map.h @@ -777,16 +777,6 @@ QT_CLASS_LIB(QWidgetItem, QtWidgets, qlayoutitem.h) QT_CLASS_LIB(QWidgetItemV2, QtWidgets, qlayoutitem.h) QT_CLASS_LIB(QPalette, QtGui, qpalette.h) QT_CLASS_LIB(QColorGroup, QtWidgets, qpalette.h) -QT_CLASS_LIB(QPlatformCursorImage, QtGui, qplatformcursor_qpa.h) -QT_CLASS_LIB(QPlatformCursorPrivate, QtGui, qplatformcursor_qpa.h) -QT_CLASS_LIB(QPlatformCursor, QtGui, qplatformcursor_qpa.h) -QT_CLASS_LIB(QPlatformOpenGLContext, QtGui, qplatformopenglcontext_qpa.h) -QT_CLASS_LIB(QPlatformIntegration, QtGui, qplatformintegration_qpa.h) -QT_CLASS_LIB(QPlatformIntegrationFactoryInterface, QtGui, qplatformintegrationplugin_qpa.h) -QT_CLASS_LIB(QPlatformIntegrationPlugin, QtGui, qplatformintegrationplugin_qpa.h) -QT_CLASS_LIB(QPlatformScreen, QtGui, qplatformscreen_qpa.h) -QT_CLASS_LIB(QPlatformWindow, QtGui, qplatformwindow_qpa.h) -QT_CLASS_LIB(QPlatformWindowFormat, QtGui, qplatformwindowformat_qpa.h) QT_CLASS_LIB(QSessionManager, QtGui, qsessionmanager.h) QT_CLASS_LIB(QShortcut, QtWidgets, qshortcut.h) QT_CLASS_LIB(QSizePolicy, QtWidgets, qsizepolicy.h) @@ -915,8 +905,6 @@ QT_CLASS_LIB(QFontInfo, QtGui, qfontinfo.h) QT_CLASS_LIB(QFontMetrics, QtGui, qfontmetrics.h) QT_CLASS_LIB(QFontMetricsF, QtGui, qfontmetrics.h) QT_CLASS_LIB(QGlyphs, QtGui, qglyphs.h) -QT_CLASS_LIB(QSupportedWritingSystems, QtGui, qplatformfontdatabase_qpa.h) -QT_CLASS_LIB(QPlatformFontDatabase, QtGui, qplatformfontdatabase_qpa.h) QT_CLASS_LIB(QStaticText, QtGui, qstatictext.h) QT_CLASS_LIB(QSyntaxHighlighter, QtGui, qsyntaxhighlighter.h) QT_CLASS_LIB(QTextCursor, QtGui, qtextcursor.h) diff --git a/src/widgets/dialogs/qdialog.cpp b/src/widgets/dialogs/qdialog.cpp index 718d64bd27..82a7b1a30d 100644 --- a/src/widgets/dialogs/qdialog.cpp +++ b/src/widgets/dialogs/qdialog.cpp @@ -52,10 +52,10 @@ #include "qwhatsthis.h" #include "qmenu.h" #include "qcursor.h" -#include "qplatformtheme_qpa.h" +#include <qpa/qplatformtheme.h> #include "private/qdialog_p.h" #include "private/qguiapplication_p.h" -#include "qplatformtheme_qpa.h" +#include <qpa/qplatformtheme.h> #ifndef QT_NO_ACCESSIBILITY #include "qaccessible.h" #endif diff --git a/src/widgets/dialogs/qdialog_p.h b/src/widgets/dialogs/qdialog_p.h index c40a885f86..8c53d6a404 100644 --- a/src/widgets/dialogs/qdialog_p.h +++ b/src/widgets/dialogs/qdialog_p.h @@ -58,7 +58,7 @@ #include "QtCore/qpointer.h" #include "QtWidgets/qdialog.h" #include "QtWidgets/qpushbutton.h" -#include <QtGui/QPlatformDialogHelper> +#include <qpa/qplatformdialoghelper.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/dialogs/qfontdialog_p.h b/src/widgets/dialogs/qfontdialog_p.h index 75a9045d2b..e7b0e91340 100644 --- a/src/widgets/dialogs/qfontdialog_p.h +++ b/src/widgets/dialogs/qfontdialog_p.h @@ -57,7 +57,7 @@ #include "private/qdialog_p.h" #include "qfontdatabase.h" #include "qfontdialog.h" -#include "qplatformdialoghelper_qpa.h" +#include <qpa/qplatformdialoghelper.h> #include "qsharedpointer.h" #ifndef QT_NO_FONTDIALOG diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp index 92915b1bb1..784748fe73 100644 --- a/src/widgets/dialogs/qmessagebox.cpp +++ b/src/widgets/dialogs/qmessagebox.cpp @@ -67,7 +67,7 @@ #ifdef Q_OS_WIN # include <QtCore/qt_windows.h> -# include <QtGui/QPlatformNativeInterface> +#include <qpa/qplatformnativeinterface.h> #endif QT_BEGIN_NAMESPACE diff --git a/src/widgets/dialogs/qwizard_win.cpp b/src/widgets/dialogs/qwizard_win.cpp index 49450be75b..3e0aedcabc 100644 --- a/src/widgets/dialogs/qwizard_win.cpp +++ b/src/widgets/dialogs/qwizard_win.cpp @@ -45,7 +45,7 @@ #include "qwizard_win_p.h" #include <private/qsystemlibrary_p.h> #include <private/qapplication_p.h> -#include "qplatformnativeinterface_qpa.h" +#include <qpa/qplatformnativeinterface.h> #include "qwizard.h" #include "qpaintengine.h" #include "qapplication.h" diff --git a/src/widgets/itemviews/qitemdelegate.cpp b/src/widgets/itemviews/qitemdelegate.cpp index bd9f4510f7..a9bb7271b3 100644 --- a/src/widgets/itemviews/qitemdelegate.cpp +++ b/src/widgets/itemviews/qitemdelegate.cpp @@ -44,7 +44,7 @@ #ifndef QT_NO_ITEMVIEWS #include <qabstractitemmodel.h> #include <qapplication.h> -#include <qplatformintegration_qpa.h> +#include <qpa/qplatformintegration.h> #include <private/qguiapplication_p.h> #include <qbrush.h> #include <qlineedit.h> diff --git a/src/widgets/itemviews/qstyleditemdelegate.cpp b/src/widgets/itemviews/qstyleditemdelegate.cpp index 119692531f..5732f65f32 100644 --- a/src/widgets/itemviews/qstyleditemdelegate.cpp +++ b/src/widgets/itemviews/qstyleditemdelegate.cpp @@ -44,7 +44,7 @@ #ifndef QT_NO_ITEMVIEWS #include <qabstractitemmodel.h> #include <qapplication.h> -#include <qplatformintegration_qpa.h> +#include <qpa/qplatformintegration.h> #include <private/qguiapplication_p.h> #include <qbrush.h> #include <qlineedit.h> diff --git a/src/widgets/kernel/kernel.pri b/src/widgets/kernel/kernel.pri index 97430babd3..9e3d82ea12 100644 --- a/src/widgets/kernel/kernel.pri +++ b/src/widgets/kernel/kernel.pri @@ -42,7 +42,7 @@ HEADERS += \ kernel/qsoftkeymanager_common_p.h \ kernel/qdesktopwidget_qpa_p.h \ kernel/qwidgetwindow_qpa_p.h \ - kernel/qplatformmenu_qpa.h + kernel/qplatformmenu.h SOURCES += \ kernel/qaction.cpp \ diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index 734c737e84..369f9b9063 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -72,7 +72,7 @@ #include <QtWidgets/qgraphicsproxywidget.h> #include <QtGui/qstylehints.h> #include <QtGui/qinputmethod.h> -#include <QtGui/qplatformtheme_qpa.h> +#include <qpa/qplatformtheme.h> #include "private/qkeymapper_p.h" @@ -92,7 +92,7 @@ #include "qgesture.h" #include "private/qgesturemanager_p.h" #include "private/qguiapplication_p.h" -#include "qplatformfontdatabase_qpa.h" +#include <qpa/qplatformfontdatabase.h> #ifndef QT_NO_LIBRARY #include "qlibrary.h" #endif diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h index b1f510c5a5..9e92a6d121 100644 --- a/src/widgets/kernel/qapplication_p.h +++ b/src/widgets/kernel/qapplication_p.h @@ -61,7 +61,7 @@ #include "QtGui/qregion.h" #include "QtGui/qwindow.h" #include "qwidget.h" -#include "QtGui/qplatformnativeinterface_qpa.h" +#include <qpa/qplatformnativeinterface.h> #include "QtCore/qmutex.h" #include "QtCore/qtranslator.h" #include "QtCore/qbasictimer.h" @@ -72,7 +72,7 @@ #include <QTime> #include <QWindowSystemInterface> #include "private/qwindowsysteminterface_qpa_p.h" -#include "QtGui/qplatformintegration_qpa.h" +#include <qpa/qplatformintegration.h> #include "private/qguiapplication_p.h" QT_BEGIN_NAMESPACE diff --git a/src/widgets/kernel/qapplication_qpa.cpp b/src/widgets/kernel/qapplication_qpa.cpp index 0651d5bf44..998f06cd15 100644 --- a/src/widgets/kernel/qapplication_qpa.cpp +++ b/src/widgets/kernel/qapplication_qpa.cpp @@ -52,15 +52,15 @@ #include "private/qevent_p.h" #include "qgenericpluginfactory_qpa.h" -#include "private/qplatformintegrationfactory_qpa_p.h" +#include <qpa/qplatformintegrationfactory_p.h> #include <qdesktopwidget.h> -#include <QPlatformCursor> -#include <QPlatformTheme> +#include <qpa/qplatformcursor.h> +#include <qpa/qplatformtheme.h> #include <qdebug.h> #include <QWindowSystemInterface> #include "private/qwindowsysteminterface_qpa_p.h" -#include <QPlatformIntegration> +#include <qpa/qplatformintegration.h> #include "qdesktopwidget_qpa_p.h" #include "qwidgetwindow_qpa_p.h" diff --git a/src/widgets/kernel/qiconloader.cpp b/src/widgets/kernel/qiconloader.cpp index e1828fd1f1..38cee3e51f 100644 --- a/src/widgets/kernel/qiconloader.cpp +++ b/src/widgets/kernel/qiconloader.cpp @@ -48,7 +48,7 @@ #include <QtWidgets/QApplication> #include <QtWidgets/QIconEnginePlugin> #include <QtGui/QPixmapCache> -#include <QtGui/QPlatformTheme> +#include <qpa/qplatformtheme.h> #include <QtWidgets/QIconEngine> #include <QtWidgets/QStyleOption> #include <QtCore/QList> diff --git a/src/widgets/kernel/qplatformmenu_qpa.h b/src/widgets/kernel/qplatformmenu.h index cbd7eae6ac..cbd7eae6ac 100644 --- a/src/widgets/kernel/qplatformmenu_qpa.h +++ b/src/widgets/kernel/qplatformmenu.h diff --git a/src/widgets/kernel/qplatformmenu_qpa.cpp b/src/widgets/kernel/qplatformmenu_qpa.cpp index 95a70d9dcd..f28560e560 100644 --- a/src/widgets/kernel/qplatformmenu_qpa.cpp +++ b/src/widgets/kernel/qplatformmenu_qpa.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qplatformmenu_qpa.h" +#include "qplatformmenu.h" QT_BEGIN_NAMESPACE diff --git a/src/widgets/kernel/qwhatsthis.cpp b/src/widgets/kernel/qwhatsthis.cpp index 5df69be020..907a29f3fb 100644 --- a/src/widgets/kernel/qwhatsthis.cpp +++ b/src/widgets/kernel/qwhatsthis.cpp @@ -55,7 +55,7 @@ #include "qcursor.h" #include "qbitmap.h" #include "qtextdocument.h" -#include "qplatformtheme_qpa.h" +#include <qpa/qplatformtheme.h> #include "private/qtextdocumentlayout_p.h" #include "qtoolbutton.h" #include "qdebug.h" diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 9abba54390..dcd052a94e 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -67,7 +67,7 @@ # include "qtoolbar.h" # include <private/qmainwindowlayout_p.h> #endif -#include "qplatformwindow_qpa.h" +#include <qpa/qplatformwindow.h> #include "private/qwidgetwindow_qpa_p.h" #include "qpainter.h" #include "qtooltip.h" diff --git a/src/widgets/kernel/qwidget_qpa.cpp b/src/widgets/kernel/qwidget_qpa.cpp index a8175455b2..97cf921691 100644 --- a/src/widgets/kernel/qwidget_qpa.cpp +++ b/src/widgets/kernel/qwidget_qpa.cpp @@ -47,12 +47,12 @@ #include "private/qwidgetwindow_qpa_p.h" #include "private/qapplication_p.h" #include "QtWidgets/qdesktopwidget.h" -#include "QtGui/qplatformwindow_qpa.h" +#include <qpa/qplatformwindow.h> #include "QtGui/qsurfaceformat.h" -#include "QtGui/qplatformopenglcontext_qpa.h" +#include <qpa/qplatformopenglcontext.h> #include "QtGui/private/qwindow_p.h" -#include <QtGui/QPlatformCursor> +#include <qpa/qplatformcursor.h> #include <QtGui/QGuiApplication> #include <QtGui/QScreen> diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index b2b1d3fec5..3de94a8f17 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -45,7 +45,7 @@ #include <qfile.h> #include <qapplication.h> #include <private/qguiapplication_p.h> -#include <qplatformtheme_qpa.h> +#include <qpa/qplatformtheme.h> #include <qbitmap.h> #include <qcache.h> #include <qdockwidget.h> diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm index 05bd90abef..662f0e2a60 100644 --- a/src/widgets/styles/qmacstyle_mac.mm +++ b/src/widgets/styles/qmacstyle_mac.mm @@ -100,7 +100,7 @@ #include <QtWidgets/qgraphicsproxywidget.h> #include <QtWidgets/qgraphicsview.h> #include <private/qstylehelper_p.h> -#include <QtGui/QPlatformFontDatabase> +#include <qpa/qplatformfontdatabase.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/styles/qwindowsvistastyle.cpp b/src/widgets/styles/qwindowsvistastyle.cpp index 6fce426dd3..bcb24db663 100644 --- a/src/widgets/styles/qwindowsvistastyle.cpp +++ b/src/widgets/styles/qwindowsvistastyle.cpp @@ -46,7 +46,7 @@ #include <private/qstylehelper_p.h> #include <private/qsystemlibrary_p.h> #include <private/qapplication_p.h> -#include <qplatformnativeinterface_qpa.h> +#include <qpa/qplatformnativeinterface.h> #if !defined(QT_NO_STYLE_WINDOWSVISTA) || defined(QT_PLUGIN) diff --git a/src/widgets/styles/qwindowsxpstyle.cpp b/src/widgets/styles/qwindowsxpstyle.cpp index 18f138010b..18a28bc556 100644 --- a/src/widgets/styles/qwindowsxpstyle.cpp +++ b/src/widgets/styles/qwindowsxpstyle.cpp @@ -46,7 +46,7 @@ #include <private/qobject_p.h> #include <private/qpaintengine_raster_p.h> #include <private/qapplication_p.h> -#include <qplatformnativeinterface_qpa.h> +#include <qpa/qplatformnativeinterface.h> #include <private/qstylehelper_p.h> #include <private/qwidget_p.h> #include <private/qsystemlibrary_p.h> diff --git a/src/widgets/util/qsystemtrayicon_win.cpp b/src/widgets/util/qsystemtrayicon_win.cpp index fa72e791ba..84becf4a70 100644 --- a/src/widgets/util/qsystemtrayicon_win.cpp +++ b/src/widgets/util/qsystemtrayicon_win.cpp @@ -52,7 +52,7 @@ #include <private/qsystemlibrary_p.h> #include <private/qguiapplication_p.h> -#include <QPlatformNativeInterface> +#include <qpa/qplatformnativeinterface.h> #include <QSettings> #include <QDebug> #include <QHash> diff --git a/src/widgets/util/qsystemtrayicon_x11.cpp b/src/widgets/util/qsystemtrayicon_x11.cpp index 174c39d1f6..e58d0d9315 100644 --- a/src/widgets/util/qsystemtrayicon_x11.cpp +++ b/src/widgets/util/qsystemtrayicon_x11.cpp @@ -54,7 +54,7 @@ #include <qguiapplication.h> #include <qscreen.h> #include <qbackingstore.h> -#include <qplatformnativeinterface_qpa.h> +#include <qpa/qplatformnativeinterface.h> #include <qdebug.h> #include <X11/Xlib.h> diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index bea4061076..6a8e7b4641 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -43,7 +43,7 @@ #ifndef QT_NO_COMBOBOX #include <qstylepainter.h> -#include <qplatformtheme_qpa.h> +#include <qpa/qplatformtheme.h> #include <qlineedit.h> #include <qapplication.h> #include <qdesktopwidget.h> diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp index 2abd4ceef7..5dc26f6ee8 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -49,7 +49,7 @@ #include "qtimer.h" #include "qlayout.h" #include "qpainter.h" -#include "qplatformtheme_qpa.h" +#include <qpa/qplatformtheme.h> #include "qapplication.h" #include "qdesktopwidget.h" #ifndef QT_NO_ACCESSIBILITY @@ -71,7 +71,7 @@ #include <private/qaction_p.h> #include <private/qsoftkeymanager_p.h> #include <private/qguiapplication_p.h> -#include <qplatformtheme_qpa.h> +#include <qpa/qplatformtheme.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qmenu_p.h b/src/widgets/widgets/qmenu_p.h index d637a9be8f..692fd19050 100644 --- a/src/widgets/widgets/qmenu_p.h +++ b/src/widgets/widgets/qmenu_p.h @@ -61,7 +61,7 @@ #include "QtCore/qbasictimer.h" #include "private/qwidget_p.h" -#include <qplatformmenu_qpa.h> +#include <qpa/qplatformmenu.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp index c9818e056c..11ae61fb90 100644 --- a/src/widgets/widgets/qmenubar.cpp +++ b/src/widgets/widgets/qmenubar.cpp @@ -55,7 +55,7 @@ #include <qtoolbar.h> #include <qtoolbutton.h> #include <qwhatsthis.h> -#include <qplatformtheme_qpa.h> +#include <qpa/qplatformtheme.h> #include "private/qguiapplication_p.h" #ifndef QT_NO_MENUBAR diff --git a/src/widgets/widgets/qwidgetlinecontrol.cpp b/src/widgets/widgets/qwidgetlinecontrol.cpp index 017cbee219..6347593efe 100644 --- a/src/widgets/widgets/qwidgetlinecontrol.cpp +++ b/src/widgets/widgets/qwidgetlinecontrol.cpp @@ -46,7 +46,7 @@ #include "qabstractitemview.h" #include "qclipboard.h" #include <private/qguiapplication_p.h> -#include <qplatformtheme_qpa.h> +#include <qpa/qplatformtheme.h> #include <qstylehints.h> #ifndef QT_NO_ACCESSIBILITY #include "qaccessible.h" |