diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-14 17:08:40 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-14 17:08:40 (GMT) |
| commit | ebd0823fa2e8b1a19bff32a39c4051ba8535d501 (patch) | |
| tree | 04e9fa95c15ccbda8acca965b40cc2e8245968fb /src/testlib | |
| parent | e8455f867cb998b86e26fcce88deac1c757b6fcc (diff) | |
| parent | d1edbe110240e5ede67f10cf6620cc6eef26b359 (diff) | |
| download | Qt-ebd0823fa2e8b1a19bff32a39c4051ba8535d501.zip Qt-ebd0823fa2e8b1a19bff32a39c4051ba8535d501.tar.gz Qt-ebd0823fa2e8b1a19bff32a39c4051ba8535d501.tar.bz2 | |
Merge branch '4.6'
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/qtest_gui.h | 8 | ||||
| -rw-r--r-- | src/testlib/qtestevent.h | 2 | ||||
| -rw-r--r-- | src/testlib/qtestkeyboard.h | 2 | ||||
| -rw-r--r-- | src/testlib/qtestmouse.h | 2 |
4 files changed, 12 insertions, 2 deletions
diff --git a/src/testlib/qtest_gui.h b/src/testlib/qtest_gui.h index 92ca055..13063a8 100644 --- a/src/testlib/qtest_gui.h +++ b/src/testlib/qtest_gui.h @@ -42,6 +42,14 @@ #ifndef QTEST_GUI_H #define QTEST_GUI_H +// enable GUI features +#ifndef QT_GUI_LIB +#define QT_GUI_LIB +#endif +#if 0 +#pragma qt_class(QtTestGui) +#endif + #include <QtTest/qtestassert.h> #include <QtTest/qtest.h> #include <QtTest/qtestevent.h> diff --git a/src/testlib/qtestevent.h b/src/testlib/qtestevent.h index 95f2028..55df572 100644 --- a/src/testlib/qtestevent.h +++ b/src/testlib/qtestevent.h @@ -48,8 +48,10 @@ #endif #include <QtTest/qtest_global.h> +#ifdef QT_GUI_LIB #include <QtTest/qtestkeyboard.h> #include <QtTest/qtestmouse.h> +#endif #include <QtTest/qtestsystem.h> #include <QtCore/qlist.h> diff --git a/src/testlib/qtestkeyboard.h b/src/testlib/qtestkeyboard.h index 42012e9..11c3b70 100644 --- a/src/testlib/qtestkeyboard.h +++ b/src/testlib/qtestkeyboard.h @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#if !defined(QTESTKEYBOARD_H) && defined(QT_GUI_LIB) +#if !defined(QTESTKEYBOARD_H) #define QTESTKEYBOARD_H #if 0 diff --git a/src/testlib/qtestmouse.h b/src/testlib/qtestmouse.h index feb64cf..f339a5a 100644 --- a/src/testlib/qtestmouse.h +++ b/src/testlib/qtestmouse.h @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#if !defined(QTESTMOUSE_H) && defined(QT_GUI_LIB) +#if !defined(QTESTMOUSE_H) #define QTESTMOUSE_H #if 0 |