diff options
5 files changed, 6 insertions, 4 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp index dc7fb71c..634c0a7d 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp @@ -1647,7 +1647,7 @@ static RegisterAnchorLineAtStartup registerAnchorLineAtStartup; Constructs a QDeclarativeItem with the given \a parent. */ QDeclarativeItem::QDeclarativeItem(QDeclarativeItem* parent) - : QGraphicsObject(*(new QDeclarativeItemPrivate), parent, 0) + : QGraphicsObject(*(new QDeclarativeItemPrivate), parent) { Q_D(QDeclarativeItem); d->init(parent); @@ -1656,7 +1656,7 @@ QDeclarativeItem::QDeclarativeItem(QDeclarativeItem* parent) /*! \internal */ QDeclarativeItem::QDeclarativeItem(QDeclarativeItemPrivate &dd, QDeclarativeItem *parent) - : QGraphicsObject(dd, parent, 0) + : QGraphicsObject(dd, parent) { Q_D(QDeclarativeItem); d->init(parent); 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 |