diff options
Diffstat (limited to 'src/plugins/platforms')
112 files changed, 129 insertions, 129 deletions
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> |