diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-08-03 11:54:17 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-03 03:58:22 +0200 |
| commit | 1830b5eab5aa692de33fe6f8fe9563b6632994fd (patch) | |
| tree | 2a78d38b46ca9e9df1e054b3bedda1ca62282697 /tests/auto/declarative | |
| parent | bfb342a069e09547c7e3fa9fb5639a118f9b2825 (diff) | |
Compile fix for QWindowSystemInterface and QGraphicsObject
Adapt to changes in qtbase - removal of third parameter to the
QGraphicsObject ctor, and the declaration of the
QWindowSystemInterface class.
Change-Id: I8b01ae67f09cbf4fc2e3e062dc8b976ccb061234
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/declarative')
4 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/declarative/qdeclarativeapplication/qdeclarativeapplication.pro b/tests/auto/declarative/qdeclarativeapplication/qdeclarativeapplication.pro index aff3d64a..631e8d64 100644 --- a/tests/auto/declarative/qdeclarativeapplication/qdeclarativeapplication.pro +++ b/tests/auto/declarative/qdeclarativeapplication/qdeclarativeapplication.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeapplication QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 gui widgets +contains(QT_CONFIG,quick1): QT += quick1 gui-private widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeapplication.cpp diff --git a/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp b/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp index 78a1f130..317a1ca3 100644 --- a/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp +++ b/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp @@ -46,6 +46,7 @@ #include <QtWidgets/qgraphicsview.h> #include <QtWidgets/qgraphicsscene.h> #include <QtWidgets/qapplication.h> +#include <QtGui/qpa/qwindowsysteminterface.h> class tst_qdeclarativeapplication : public QObject { diff --git a/tests/auto/declarative/qdeclarativepincharea/qdeclarativepincharea.pro b/tests/auto/declarative/qdeclarativepincharea/qdeclarativepincharea.pro index aaecdd90..0d9ecbcd 100644 --- a/tests/auto/declarative/qdeclarativepincharea/qdeclarativepincharea.pro +++ b/tests/auto/declarative/qdeclarativepincharea/qdeclarativepincharea.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativepincharea QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui widgets +contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui-private widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativepincharea.cpp diff --git a/tests/auto/declarative/qdeclarativepincharea/tst_qdeclarativepincharea.cpp b/tests/auto/declarative/qdeclarativepincharea/tst_qdeclarativepincharea.cpp index b1c7de23..09c9bb3e 100644 --- a/tests/auto/declarative/qdeclarativepincharea/tst_qdeclarativepincharea.cpp +++ b/tests/auto/declarative/qdeclarativepincharea/tst_qdeclarativepincharea.cpp @@ -47,6 +47,7 @@ #include <private/qdeclarativeflickable_p.h> #include <QtQuick1/qdeclarativeview.h> #include <QtQuick1/qdeclarativecontext.h> +#include <QtGui/qpa/qwindowsysteminterface.h> #ifdef Q_OS_SYMBIAN // In Symbian OS test data is located in applications private dir |