diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2012-07-26 13:23:28 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-03 00:38:09 +0200 |
| commit | 3d0af143ca51af0a3cbd81a794e6726992f9a86b (patch) | |
| tree | 76425c1863d878b016d4cb35e94d30df146b1e37 /tests/auto/gui | |
| parent | 328550ff008da53d865f3a6f245aa4753d1b3527 (diff) | |
Revert "Move QWindowSystemInterface out of qpa."
This reverts commit 784a877d3cd9a1a75aca9c83146389503a966071.
Conflicts:
src/plugins/platforms/cocoa/qcocoawindow.mm
src/testlib/qtestkeyboard.h
src/testlib/qtestmouse.h
src/testlib/qtesttouch.h
Change-Id: Iebfed179b3eb7f30e4c95edcae5a8ad6fd50330e
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'tests/auto/gui')
4 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp index f7f0f8d28c..5e063fb266 100644 --- a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp +++ b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp @@ -43,7 +43,7 @@ #include <QtTest/QtTest> #include <QtGui/QGuiApplication> #include <QtGui/QWindow> -#include <QtGui/QWindowSystemInterface> +#include <qpa/qwindowsysteminterface.h> #include <QDebug> diff --git a/tests/auto/gui/kernel/qscreen/tst_qscreen.cpp b/tests/auto/gui/kernel/qscreen/tst_qscreen.cpp index 8a0246c71e..278fe67cbf 100644 --- a/tests/auto/gui/kernel/qscreen/tst_qscreen.cpp +++ b/tests/auto/gui/kernel/qscreen/tst_qscreen.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include <qscreen.h> -#include <QtGui/QWindowSystemInterface> +#include <qpa/qwindowsysteminterface.h> #include <QtTest/QtTest> diff --git a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp index 694a76f355..485a9724a5 100644 --- a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp +++ b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp @@ -42,7 +42,7 @@ #include <QtGui> #include <QtWidgets> #include <QtTest> -#include <QtGui/QWindowSystemInterface> +#include <qpa/qwindowsysteminterface.h> static QWindowSystemInterface::TouchPoint touchPoint(const QTouchEvent::TouchPoint& pt) { diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp index 0346284e61..0f9cf2b5d8 100644 --- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp +++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include <qwindow.h> -#include <QtGui/QWindowSystemInterface> +#include <qpa/qwindowsysteminterface.h> #include <QtTest/QtTest> |