From 5ac4a1304b44283bb0ddf593b08e7e44ed9a107f Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Thu, 26 Jul 2012 18:48:56 +0200 Subject: 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 --- tests/auto/widgets/util/qscroller/qscroller.pro | 2 +- tests/auto/widgets/util/qscroller/tst_qscroller.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'tests/auto/widgets/util') diff --git a/tests/auto/widgets/util/qscroller/qscroller.pro b/tests/auto/widgets/util/qscroller/qscroller.pro index 9895ec661e..6f999f62c6 100644 --- a/tests/auto/widgets/util/qscroller/qscroller.pro +++ b/tests/auto/widgets/util/qscroller/qscroller.pro @@ -2,6 +2,6 @@ CONFIG += testcase CONFIG += parallel_test TARGET = tst_qscroller -QT += widgets testlib +QT += widgets testlib gui-private SOURCES += tst_qscroller.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/widgets/util/qscroller/tst_qscroller.cpp b/tests/auto/widgets/util/qscroller/tst_qscroller.cpp index 1eabbdf43f..67117eb51a 100644 --- a/tests/auto/widgets/util/qscroller/tst_qscroller.cpp +++ b/tests/auto/widgets/util/qscroller/tst_qscroller.cpp @@ -42,6 +42,8 @@ #include #include #include +#include + // #include class tst_QScrollerWidget : public QWidget -- cgit v1.2.3