diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-01-10 19:48:24 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-01-14 20:00:54 +0000 |
| commit | 47fab016df82b5489a74b2cb45223d8eea23a31c (patch) | |
| tree | d5644b9d4c8d3e43d229998ac4cc639be7c2b876 /src | |
| parent | afdcb64ccd4af726d1f078ab7c5f28249fa04724 (diff) | |
Don't include qeventpoint_p.h from qevent_p.h
The header no longer uses QMutableEventPoint.
Fix TUs that relied on the transitive include.
Task-number: QTBUG-99615
Pick-to: 6.3
Change-Id: Iae4ff34ea708304fcd365fd763875dd4a97a1cf8
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qevent.cpp | 1 | ||||
| -rw-r--r-- | src/gui/kernel/qevent_p.h | 1 | ||||
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 1 | ||||
| -rw-r--r-- | src/gui/kernel/qpointingdevice.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qtestsupport_gui.cpp | 1 | ||||
| -rw-r--r-- | src/gui/kernel/qwindowsysteminterface.cpp | 1 | ||||
| -rw-r--r-- | src/widgets/graphicsview/qgraphicsscene.cpp | 1 | ||||
| -rw-r--r-- | src/widgets/graphicsview/qgraphicsview.cpp | 1 | ||||
| -rw-r--r-- | src/widgets/kernel/qapplication.cpp | 1 | ||||
| -rw-r--r-- | src/widgets/kernel/qtestsupport_widgets.cpp | 1 |
10 files changed, 10 insertions, 1 deletions
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index af08d76e7ae..5e7c2a574c8 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -44,6 +44,7 @@ #include "private/qpointingdevice_p.h" #include "qpa/qplatformintegration.h" #include "private/qevent_p.h" +#include "private/qeventpoint_p.h" #include "qfile.h" #include "qhashfunctions.h" #include "qmetaobject.h" diff --git a/src/gui/kernel/qevent_p.h b/src/gui/kernel/qevent_p.h index cd25f6f174b..6b8e3ef3375 100644 --- a/src/gui/kernel/qevent_p.h +++ b/src/gui/kernel/qevent_p.h @@ -52,7 +52,6 @@ // #include <QtGui/private/qtguiglobal_p.h> -#include <QtGui/private/qeventpoint_p.h> #include <QtCore/qurl.h> #include <QtGui/qevent.h> #include <QtGui/qwindow.h> diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 51de8580f75..313f1bcb54e 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -44,6 +44,7 @@ #include "private/qabstractfileiconprovider_p.h" #include <qpa/qplatformintegrationfactory_p.h> #include "private/qevent_p.h" +#include "private/qeventpoint_p.h" #include "qfont.h" #include "qpointingdevice.h" #include <qpa/qplatformfontdatabase.h> diff --git a/src/gui/kernel/qpointingdevice.cpp b/src/gui/kernel/qpointingdevice.cpp index e9ff3fc7852..b6d94218972 100644 --- a/src/gui/kernel/qpointingdevice.cpp +++ b/src/gui/kernel/qpointingdevice.cpp @@ -40,6 +40,8 @@ #include "qpointingdevice.h" #include "qpointingdevice_p.h" #include "qwindowsysteminterface_p.h" +#include "qeventpoint_p.h" + #include <QList> #include <QLoggingCategory> #include <QMutex> diff --git a/src/gui/kernel/qtestsupport_gui.cpp b/src/gui/kernel/qtestsupport_gui.cpp index 41798d650d5..c594b243fc4 100644 --- a/src/gui/kernel/qtestsupport_gui.cpp +++ b/src/gui/kernel/qtestsupport_gui.cpp @@ -38,6 +38,7 @@ ****************************************************************************/ #include <private/qguiapplication_p.h> +#include <private/qeventpoint_p.h> #include <qpa/qplatformintegration.h> diff --git a/src/gui/kernel/qwindowsysteminterface.cpp b/src/gui/kernel/qwindowsysteminterface.cpp index d4e7c5553a0..d66cefb2a97 100644 --- a/src/gui/kernel/qwindowsysteminterface.cpp +++ b/src/gui/kernel/qwindowsysteminterface.cpp @@ -41,6 +41,7 @@ #include "qwindowsysteminterface_p.h" #include "private/qguiapplication_p.h" #include "private/qevent_p.h" +#include "private/qeventpoint_p.h" #include "private/qpointingdevice_p.h" #include <QAbstractEventDispatcher> #include <qpa/qplatformintegration.h> diff --git a/src/widgets/graphicsview/qgraphicsscene.cpp b/src/widgets/graphicsview/qgraphicsscene.cpp index 5e30f114ebd..f41ced1a382 100644 --- a/src/widgets/graphicsview/qgraphicsscene.cpp +++ b/src/widgets/graphicsview/qgraphicsscene.cpp @@ -244,6 +244,7 @@ #include <QtGui/qinputmethod.h> #include <private/qapplication_p.h> #include <private/qevent_p.h> +#include <QtGui/private/qeventpoint_p.h> #include <private/qobject_p.h> #if QT_CONFIG(graphicseffect) #include <private/qgraphicseffect_p.h> diff --git a/src/widgets/graphicsview/qgraphicsview.cpp b/src/widgets/graphicsview/qgraphicsview.cpp index 1a147e5e40f..df5a2756168 100644 --- a/src/widgets/graphicsview/qgraphicsview.cpp +++ b/src/widgets/graphicsview/qgraphicsview.cpp @@ -294,6 +294,7 @@ static const int QGRAPHICSVIEW_PREALLOC_STYLE_OPTIONS = 503; // largest prime < #include <QtWidgets/qstyleoption.h> #include <private/qevent_p.h> +#include <QtGui/private/qeventpoint_p.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index 75ffa471cc0..f3deab05a12 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -92,6 +92,7 @@ #include <private/qthread_p.h> #include <QtGui/private/qevent_p.h> +#include <QtGui/private/qeventpoint_p.h> #include <private/qfont_p.h> #if QT_CONFIG(action) #include <private/qaction_p.h> diff --git a/src/widgets/kernel/qtestsupport_widgets.cpp b/src/widgets/kernel/qtestsupport_widgets.cpp index 9c5603fc5a8..acc69d098c4 100644 --- a/src/widgets/kernel/qtestsupport_widgets.cpp +++ b/src/widgets/kernel/qtestsupport_widgets.cpp @@ -46,6 +46,7 @@ #include <QtCore/qthread.h> #include <QtGui/qtestsupport_gui.h> #include <QtGui/private/qevent_p.h> +#include <QtGui/private/qeventpoint_p.h> QT_BEGIN_NAMESPACE |