diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2012-07-26 18:48:56 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-02 17:25:37 +0200 |
| commit | 5ac4a1304b44283bb0ddf593b08e7e44ed9a107f (patch) | |
| tree | 632ffbe48e35227ca25faa6797f2e75901e673e6 /tests/auto/other | |
| parent | 4c4ba15a409737abe7cc07bdc452d556ec9ecbdc (diff) | |
Make tests compile without gui-private
Add new qt_handleXXX functions that forward to the QWindowSystemInterface
functions, and use those in the testlib inline functions. Remove use of
struct QWindowSystemInterface::TouchPoint from the testlib header files
(requiring some slight increase in ugliness in the two tests that use
that struct).
Also remove the qmake hack that adds private headers to all tests
Change-Id: Iec23537e55a44802f6e9cd463f7a0f82007c5250
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
Diffstat (limited to 'tests/auto/other')
| -rw-r--r-- | tests/auto/other/gestures/gestures.pro | 2 | ||||
| -rw-r--r-- | tests/auto/other/gestures/tst_gestures.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/other/qaccessibility/qaccessibility.pro | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/other/gestures/gestures.pro b/tests/auto/other/gestures/gestures.pro index a4e78ef4b4..fa87dbddfb 100644 --- a/tests/auto/other/gestures/gestures.pro +++ b/tests/auto/other/gestures/gestures.pro @@ -1,5 +1,5 @@ CONFIG += testcase TARGET = tst_gestures -QT += widgets testlib +QT += widgets testlib gui-private SOURCES += tst_gestures.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/other/gestures/tst_gestures.cpp b/tests/auto/other/gestures/tst_gestures.cpp index db10877b8a..fb27df5555 100644 --- a/tests/auto/other/gestures/tst_gestures.cpp +++ b/tests/auto/other/gestures/tst_gestures.cpp @@ -52,6 +52,7 @@ #include <qgraphicswidget.h> #include <qgraphicsview.h> #include <qmainwindow.h> +#include <QtGui/QWindowSystemInterface> #include <qdebug.h> diff --git a/tests/auto/other/qaccessibility/qaccessibility.pro b/tests/auto/other/qaccessibility/qaccessibility.pro index 13c9c361ce..919c24d80b 100644 --- a/tests/auto/other/qaccessibility/qaccessibility.pro +++ b/tests/auto/other/qaccessibility/qaccessibility.pro @@ -1,7 +1,7 @@ CONFIG += testcase TARGET = tst_qaccessibility requires(contains(QT_CONFIG,accessibility)) -QT += widgets testlib +QT += widgets testlib gui-private SOURCES += tst_qaccessibility.cpp unix:!mac:LIBS+=-lm |