diff options
Diffstat (limited to 'src/platformsupport')
18 files changed, 22 insertions, 22 deletions
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> |