diff options
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/qbenchmark.cpp | 2 | ||||
| -rw-r--r-- | src/testlib/qtest.h | 14 | ||||
| -rw-r--r-- | src/testlib/qtest_gui.h | 2 | ||||
| -rw-r--r-- | src/testlib/qtestaccessible.h | 4 | ||||
| -rw-r--r-- | src/testlib/qtestkeyboard.h | 4 | ||||
| -rw-r--r-- | src/testlib/qtestmouse.h | 4 | ||||
| -rw-r--r-- | src/testlib/qtesttouch.h | 2 | ||||
| -rw-r--r-- | src/testlib/testlib.pro | 2 |
8 files changed, 23 insertions, 11 deletions
diff --git a/src/testlib/qbenchmark.cpp b/src/testlib/qbenchmark.cpp index 2e8fa1ee99..1cb10a7ac6 100644 --- a/src/testlib/qbenchmark.cpp +++ b/src/testlib/qbenchmark.cpp @@ -44,7 +44,7 @@ #include "QtTest/private/qbenchmarkmetric_p.h" #ifdef QT_GUI_LIB -#include <QtGui/qapplication.h> +#include <QtGui/qguiapplication.h> #endif #include <QtCore/qprocess.h> diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h index 386f154f72..e671828b77 100644 --- a/src/testlib/qtest.h +++ b/src/testlib/qtest.h @@ -247,7 +247,7 @@ int main(int argc, char *argv[]) \ #include <QtTest/qtestsystem.h> -#ifdef QT_GUI_LIB +#if defined(QT_WIDGETS_LIB) #include <QtTest/qtest_gui.h> @@ -266,6 +266,18 @@ int main(int argc, char *argv[]) \ return QTest::qExec(&tc, argc, argv); \ } +#elif defined(QT_GUI_LIB) + +#include <QtTest/qtest_gui.h> + +#define QTEST_MAIN(TestObject) \ +int main(int argc, char *argv[]) \ +{ \ + QGuiApplication app(argc, argv); \ + TestObject tc; \ + return QTest::qExec(&tc, argc, argv); \ +} + #else #define QTEST_MAIN(TestObject) \ diff --git a/src/testlib/qtest_gui.h b/src/testlib/qtest_gui.h index 722e20d961..77b19f0e21 100644 --- a/src/testlib/qtest_gui.h +++ b/src/testlib/qtest_gui.h @@ -57,7 +57,7 @@ #include <QtTest/qtesttouch.h> #include <QtTest/qtestkeyboard.h> -#include <QtGui/qicon.h> +#include <QtWidgets/qicon.h> #include <QtGui/qpixmap.h> #if 0 diff --git a/src/testlib/qtestaccessible.h b/src/testlib/qtestaccessible.h index 9cec1a6bbe..a58ed2ff69 100644 --- a/src/testlib/qtestaccessible.h +++ b/src/testlib/qtestaccessible.h @@ -53,8 +53,8 @@ QVERIFY(QTestAccessibility::verifyEvent(object, child, (int)event)) #include <QtCore/qlist.h> -#include <QtGui/qaccessible.h> -#include <QtGui/qapplication.h> +#include <QtWidgets/qaccessible.h> +#include <QtWidgets/qapplication.h> QT_BEGIN_HEADER diff --git a/src/testlib/qtestkeyboard.h b/src/testlib/qtestkeyboard.h index 1a87e2515a..be141642e8 100644 --- a/src/testlib/qtestkeyboard.h +++ b/src/testlib/qtestkeyboard.h @@ -53,9 +53,9 @@ #include <QtTest/qtestspontaneevent.h> #include <QtCore/qpointer.h> -#include <QtGui/qapplication.h> +#include <QtWidgets/qapplication.h> #include <QtGui/qevent.h> -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> QT_BEGIN_HEADER diff --git a/src/testlib/qtestmouse.h b/src/testlib/qtestmouse.h index cc076361c2..c8fe0b4849 100644 --- a/src/testlib/qtestmouse.h +++ b/src/testlib/qtestmouse.h @@ -54,9 +54,9 @@ #include <QtCore/qpoint.h> #include <QtCore/qstring.h> -#include <QtGui/qapplication.h> +#include <QtWidgets/qapplication.h> #include <QtGui/qevent.h> -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> QT_BEGIN_HEADER diff --git a/src/testlib/qtesttouch.h b/src/testlib/qtesttouch.h index a1fe2df382..53a801b994 100644 --- a/src/testlib/qtesttouch.h +++ b/src/testlib/qtesttouch.h @@ -54,7 +54,7 @@ #include <QtCore/qmap.h> #include <QtGui/qevent.h> -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> QT_BEGIN_HEADER diff --git a/src/testlib/testlib.pro b/src/testlib/testlib.pro index 482c82cfd3..a65510f567 100644 --- a/src/testlib/testlib.pro +++ b/src/testlib/testlib.pro @@ -2,7 +2,7 @@ load(qt_module) TARGET = QtTest QPRO_PWD = $$PWD -QT = core +QT = core gui widgets CONFIG += module MODULE_PRI = ../modules/qt_testlib.pri |