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 /src | |
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 'src')
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativeitem.cpp | 4 |
1 files changed, 2 insertions, 2 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); |