diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-01-11 07:22:26 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-01-13 19:50:33 +0000 |
| commit | 1fb62e65e4c7458cfe4453fa8d23a8c14d87224d (patch) | |
| tree | 1d3e4775130cfbd460bd320e7a022f3c2bba3626 /tests | |
| parent | ca1e322fb28cadcf4c8dbcd29124af4b545edf56 (diff) | |
Don't rely on transitive include of qeventpoint_p.h
It will be dropped from qevent_p.h.
Task-number: QTBUG-99615
Change-Id: Id4eee3036a873f0e021b30a8d43b2c4df25dc53c
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit bec4d008c22340b1913c1871ae57a4b9b675acad)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests')
5 files changed, 6 insertions, 1 deletions
diff --git a/tests/auto/quick/pointerhandlers/qquickpinchhandler/tst_qquickpinchhandler.cpp b/tests/auto/quick/pointerhandlers/qquickpinchhandler/tst_qquickpinchhandler.cpp index 667853161b..50f6c3c435 100644 --- a/tests/auto/quick/pointerhandlers/qquickpinchhandler/tst_qquickpinchhandler.cpp +++ b/tests/auto/quick/pointerhandlers/qquickpinchhandler/tst_qquickpinchhandler.cpp @@ -29,7 +29,7 @@ #include <QtTest/QtTest> #include <QtTest/QSignalSpy> #include <QtGui/QStyleHints> -#include <QtGui/private/qevent_p.h> +#include <QtGui/private/qeventpoint_p.h> #include <qpa/qwindowsysteminterface.h> #include <QtQuick/private/qquickpinchhandler_p.h> #include <QtQuick/private/qquickrectangle_p.h> diff --git a/tests/auto/quick/qquickdeliveryagent/tst_qquickdeliveryagent.cpp b/tests/auto/quick/qquickdeliveryagent/tst_qquickdeliveryagent.cpp index 058cfbc2b7..461884f75b 100644 --- a/tests/auto/quick/qquickdeliveryagent/tst_qquickdeliveryagent.cpp +++ b/tests/auto/quick/qquickdeliveryagent/tst_qquickdeliveryagent.cpp @@ -42,6 +42,8 @@ #include <QtQuickTestUtils/private/visualtestutils_p.h> #include <QtQuickTestUtils/private/viewtestutils_p.h> +#include <QtGui/private/qeventpoint_p.h> + Q_LOGGING_CATEGORY(lcTests, "qt.quick.tests") // On one hand, uncommenting this will make troubleshooting easier (avoid the 60FPS hover events). diff --git a/tests/auto/quick/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp b/tests/auto/quick/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp index 8b143d6ea8..2519383ff5 100644 --- a/tests/auto/quick/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp +++ b/tests/auto/quick/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp @@ -37,6 +37,7 @@ #include <QtQuick/qquickview.h> #include <QtGui/QScreen> #include <QtGui/private/qevent_p.h> +#include <QtGui/private/qeventpoint_p.h> #include <QtGui/private/qpointingdevice_p.h> #include <QtQuickTestUtils/private/qmlutils_p.h> #include <QtQuickTestUtils/private/viewtestutils_p.h> diff --git a/tests/auto/quick/qquickpincharea/tst_qquickpincharea.cpp b/tests/auto/quick/qquickpincharea/tst_qquickpincharea.cpp index fd84123ff3..80ab1419af 100644 --- a/tests/auto/quick/qquickpincharea/tst_qquickpincharea.cpp +++ b/tests/auto/quick/qquickpincharea/tst_qquickpincharea.cpp @@ -30,6 +30,7 @@ #include <QtTest/QSignalSpy> #include <QtGui/QStyleHints> #include <QtGui/private/qevent_p.h> +#include <QtGui/private/qeventpoint_p.h> #include <qpa/qwindowsysteminterface.h> #include <private/qquickpincharea_p.h> #include <QtQuick/private/qquickrectangle_p.h> diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp index 6f08714fba..fcbe480b65 100644 --- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp +++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp @@ -50,6 +50,7 @@ #include <QQuickRenderControl> #include <QOperatingSystemVersion> #include <functional> +#include <QtGui/private/qeventpoint_p.h> #include <QtGui/private/qrhi_p.h> #if QT_CONFIG(opengl) #include <QOpenGLContext> |