aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/items
diff options
context:
space:
mode:
Diffstat (limited to 'src/declarative/items')
-rw-r--r--src/declarative/items/qsgitem.cpp4
-rw-r--r--src/declarative/items/qsgitem.h1
-rw-r--r--src/declarative/items/qsgtext_p_p.h2
3 files changed, 2 insertions, 5 deletions
diff --git a/src/declarative/items/qsgitem.cpp b/src/declarative/items/qsgitem.cpp
index 2b6f5573aa..b4fbacb90b 100644
--- a/src/declarative/items/qsgitem.cpp
+++ b/src/declarative/items/qsgitem.cpp
@@ -48,9 +48,7 @@
#include "qsgevents_p_p.h"
-#include <QtDeclarative/qdeclarativeitem.h>
#include <QtDeclarative/qdeclarativeengine.h>
-#include <QtDeclarative/qdeclarativeview.h>
#include <QtDeclarative/qdeclarativecomponent.h>
#include <QtDeclarative/qdeclarativeinfo.h>
#include <QtGui/qgraphicstransform.h>
@@ -1311,7 +1309,7 @@ void QSGItemPrivate::data_append(QDeclarativeListProperty<QObject> *prop, QObjec
// This test is measurably (albeit only slightly) faster than qobject_cast<>()
const QMetaObject *mo = o->metaObject();
while (mo && mo != &QSGItem::staticMetaObject) {
- if (mo == &QDeclarativeItem::staticMetaObject)
+ if (mo == &QGraphicsObject::staticMetaObject)
qWarning("Cannot add a QtQuick 1.0 item (%s) into a QtQuick 2.0 scene!", o->metaObject()->className());
mo = mo->d.superdata;
}
diff --git a/src/declarative/items/qsgitem.h b/src/declarative/items/qsgitem.h
index e7d9d0aa0a..12e93603c7 100644
--- a/src/declarative/items/qsgitem.h
+++ b/src/declarative/items/qsgitem.h
@@ -82,6 +82,7 @@ private:
Q_DECLARE_PRIVATE(QSGTransform);
};
+class QDeclarativeV8Function;
class QDeclarativeState;
class QSGAnchorLine;
class QDeclarativeTransition;
diff --git a/src/declarative/items/qsgtext_p_p.h b/src/declarative/items/qsgtext_p_p.h
index 0d4a9d2d18..050e3984ab 100644
--- a/src/declarative/items/qsgtext_p_p.h
+++ b/src/declarative/items/qsgtext_p_p.h
@@ -60,8 +60,6 @@
#include <QtDeclarative/qdeclarative.h>
#include <QtGui/qtextlayout.h>
-#include <private/qdeclarativetextlayout_p.h>
-
QT_BEGIN_NAMESPACE
class QTextLayout;