diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/kernel.pri | 4 | ||||
| -rw-r--r-- | src/gui/kernel/qguiapplication_p.h | 4 | ||||
| -rw-r--r-- | src/gui/kernel/qwindowsysteminterface.h (renamed from src/gui/kernel/qwindowsysteminterface_qpa.h) | 9 | ||||
| -rw-r--r-- | src/gui/kernel/qwindowsysteminterface_p.h (renamed from src/gui/kernel/qwindowsysteminterface_qpa_p.h) | 8 | ||||
| -rw-r--r-- | src/gui/kernel/qwindowsysteminterface_qpa.cpp | 4 | ||||
| -rw-r--r-- | src/testlib/qtestkeyboard.h | 2 | ||||
| -rw-r--r-- | src/testlib/qtestmouse.h | 2 | ||||
| -rw-r--r-- | src/testlib/qtesttouch.h | 2 |
8 files changed, 22 insertions, 13 deletions
diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri index 9825633358..efa79b5cc0 100644 --- a/src/gui/kernel/kernel.pri +++ b/src/gui/kernel/kernel.pri @@ -8,8 +8,8 @@ KERNEL_P= kernel HEADERS += \ kernel/qgenericpluginfactory_qpa.h \ kernel/qgenericplugin_qpa.h \ - kernel/qwindowsysteminterface_qpa.h \ - kernel/qwindowsysteminterface_qpa_p.h \ + kernel/qwindowsysteminterface.h \ + kernel/qwindowsysteminterface_p.h \ kernel/qplatformintegration.h \ kernel/qplatformdrag.h \ kernel/qplatformscreen.h \ diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h index a9fe118f2b..857dc5390e 100644 --- a/src/gui/kernel/qguiapplication_p.h +++ b/src/gui/kernel/qguiapplication_p.h @@ -49,8 +49,8 @@ #include <QtCore/private/qthread_p.h> -#include <QWindowSystemInterface> -#include "private/qwindowsysteminterface_qpa_p.h" +#include <qpa/qwindowsysteminterface.h> +#include <qpa/qwindowsysteminterface_p.h> #include "private/qshortcutmap_p.h" #include <qicon.h> diff --git a/src/gui/kernel/qwindowsysteminterface_qpa.h b/src/gui/kernel/qwindowsysteminterface.h index b55f3e3f33..0382ac6dbf 100644 --- a/src/gui/kernel/qwindowsysteminterface_qpa.h +++ b/src/gui/kernel/qwindowsysteminterface.h @@ -41,6 +41,15 @@ #ifndef QWINDOWSYSTEMINTERFACE_H #define QWINDOWSYSTEMINTERFACE_H +// +// W A R N I N G +// ------------- +// +// This file is part of the QPA API and is not meant to be used +// in applications. Usage of this API may make your code +// source and binary incompatible with future versions of Qt. +// + #include <QtCore/QTime> #include <QtGui/qwindowdefs.h> #include <QtCore/QEvent> diff --git a/src/gui/kernel/qwindowsysteminterface_qpa_p.h b/src/gui/kernel/qwindowsysteminterface_p.h index 8fb0652eb6..26f4cd68bb 100644 --- a/src/gui/kernel/qwindowsysteminterface_qpa_p.h +++ b/src/gui/kernel/qwindowsysteminterface_p.h @@ -38,10 +38,10 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef QWINDOWSYSTEMINTERFACE_QPA_P_H -#define QWINDOWSYSTEMINTERFACE_QPA_P_H +#ifndef QWINDOWSYSTEMINTERFACE_P_H +#define QWINDOWSYSTEMINTERFACE_P_H -#include "qwindowsysteminterface_qpa.h" +#include "qwindowsysteminterface.h" #include <QElapsedTimer> #include <QPointer> @@ -338,4 +338,4 @@ public: QT_END_HEADER QT_END_NAMESPACE -#endif // QWINDOWSYSTEMINTERFACE_QPA_P_H +#endif // QWINDOWSYSTEMINTERFACE_P_H diff --git a/src/gui/kernel/qwindowsysteminterface_qpa.cpp b/src/gui/kernel/qwindowsysteminterface_qpa.cpp index 139df98daf..e884d7caf9 100644 --- a/src/gui/kernel/qwindowsysteminterface_qpa.cpp +++ b/src/gui/kernel/qwindowsysteminterface_qpa.cpp @@ -38,9 +38,9 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "qwindowsysteminterface_qpa.h" +#include "qwindowsysteminterface.h" #include <qpa/qplatformwindow.h> -#include "qwindowsysteminterface_qpa_p.h" +#include "qwindowsysteminterface_p.h" #include "private/qguiapplication_p.h" #include "private/qevent_p.h" #include "private/qtouchdevice_p.h" diff --git a/src/testlib/qtestkeyboard.h b/src/testlib/qtestkeyboard.h index 2e43e864d5..7c37d07a0b 100644 --- a/src/testlib/qtestkeyboard.h +++ b/src/testlib/qtestkeyboard.h @@ -56,7 +56,7 @@ #include <QtGui/qguiapplication.h> #include <QtGui/qwindow.h> #include <QtGui/qevent.h> -#include <QtGui/qwindowsysteminterface_qpa.h> +#include <qpa/qwindowsysteminterface.h> #ifdef QT_WIDGETS_LIB #include <QtWidgets/qwidget.h> diff --git a/src/testlib/qtestmouse.h b/src/testlib/qtestmouse.h index 4ee31ff47f..910914bdbc 100644 --- a/src/testlib/qtestmouse.h +++ b/src/testlib/qtestmouse.h @@ -54,7 +54,7 @@ #include <QtCore/qpoint.h> #include <QtCore/qstring.h> #include <QtGui/qevent.h> -#include <QtGui/qwindowsysteminterface_qpa.h> +#include <qpa/qwindowsysteminterface.h> #ifdef QT_WIDGETS_LIB #include <QtWidgets/qapplication.h> diff --git a/src/testlib/qtesttouch.h b/src/testlib/qtesttouch.h index 6e456f375c..e19c60f812 100644 --- a/src/testlib/qtesttouch.h +++ b/src/testlib/qtesttouch.h @@ -51,7 +51,7 @@ #include <QtTest/qtestassert.h> #include <QtTest/qtestsystem.h> #include <QtTest/qtestspontaneevent.h> -#include <QtGui/QWindowSystemInterface> +#include <qpa/qwindowsysteminterface.h> #include <QtCore/qmap.h> #include <QtGui/qevent.h> #ifdef QT_WIDGETS_LIB |