diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-01-12 14:24:39 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-12 14:50:28 +0100 |
| commit | 265ce6071826304b25717af3fa4779ea98969e24 (patch) | |
| tree | 88b3ba8078fcf816e4c0282d0db472e9b3443f69 /src | |
| parent | 1453f74cc5617894c98f09428c3062dfa448044e (diff) | |
Compile if the header files from QtWidgets are unavailable
Change-Id: I0a774fc1492e882bc6c02d913e6dace189fdb992
Reviewed-by: Kevin Simons <kevin.simons@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/testlib/qtest_gui.h | 5 | ||||
| -rw-r--r-- | src/testlib/qtestkeyboard.h | 9 | ||||
| -rw-r--r-- | src/testlib/qtestmouse.h | 7 | ||||
| -rw-r--r-- | src/testlib/qtesttouch.h | 2 |
4 files changed, 18 insertions, 5 deletions
diff --git a/src/testlib/qtest_gui.h b/src/testlib/qtest_gui.h index e92547089c..a5877f9d23 100644 --- a/src/testlib/qtest_gui.h +++ b/src/testlib/qtest_gui.h @@ -57,10 +57,13 @@ #include <QtTest/qtesttouch.h> #include <QtTest/qtestkeyboard.h> -#include <QtWidgets/qicon.h> #include <QtGui/qpixmap.h> #include <QtGui/qimage.h> +#ifdef QT_WIDGETS_LIB +#include <QtWidgets/qicon.h> +#endif + #if 0 // inform syncqt #pragma qt_no_master_include diff --git a/src/testlib/qtestkeyboard.h b/src/testlib/qtestkeyboard.h index 8a823db7c8..71defcfbdc 100644 --- a/src/testlib/qtestkeyboard.h +++ b/src/testlib/qtestkeyboard.h @@ -53,11 +53,16 @@ #include <QtTest/qtestspontaneevent.h> #include <QtCore/qpointer.h> -#include <QtWidgets/qapplication.h> +#include <QtGui/qguiapplication.h> +#include <QtGui/qwindow.h> #include <QtGui/qevent.h> -#include <QtWidgets/qwidget.h> #include <QtGui/qwindowsysteminterface_qpa.h> +#ifdef QT_WIDGETS_LIB +#include <QtWidgets/qwidget.h> +#include <QtWidgets/qapplication.h> +#endif + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/testlib/qtestmouse.h b/src/testlib/qtestmouse.h index cca556b8ba..6c68b057c1 100644 --- a/src/testlib/qtestmouse.h +++ b/src/testlib/qtestmouse.h @@ -53,11 +53,14 @@ #include <QtTest/qtestspontaneevent.h> #include <QtCore/qpoint.h> #include <QtCore/qstring.h> -#include <QtWidgets/qapplication.h> #include <QtGui/qevent.h> -#include <QtWidgets/qwidget.h> #include <QtGui/qwindowsysteminterface_qpa.h> +#ifdef QT_WIDGETS_LIB +#include <QtWidgets/qapplication.h> +#include <QtWidgets/qwidget.h> +#endif + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/testlib/qtesttouch.h b/src/testlib/qtesttouch.h index 6bdd2368f9..499db58b4d 100644 --- a/src/testlib/qtesttouch.h +++ b/src/testlib/qtesttouch.h @@ -54,7 +54,9 @@ #include <QtGui/QWindowSystemInterface> #include <QtCore/qmap.h> #include <QtGui/qevent.h> +#ifdef QT_WIDGETS_LIB #include <QtWidgets/qwidget.h> +#endif QT_BEGIN_HEADER |