feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qmlpuppet: Fix build with Qt 4.7.4.

Browse Source 
Change-Id: I74f0784d76f8fa7137db22a251deaab9d99481dd
Reviewed-on: http://codereview.qt.nokia.com/4040
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
This commit is contained in:
Christian Kamm
2011-09-01 09:17:27 +02:00
parent f1298e85ed
commit 2da3219909
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/qtcreator/qml/qmlpuppet/instances/servernodeinstance.cpp
View File

@@ -54,7 +54,9 @@
#include <QSet>
#include <QtDebug>
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
#include <QSGItem>
#endif
#include <QtDeclarative/QDeclarativeEngine>
@@ -550,10 +552,12 @@ QObject *ServerNodeInstance::internalObject() const
return m_nodeInstance->object();
}
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
QSGItem *ServerNodeInstance::internalSGItem() const
{
return qobject_cast<QSGItem*>(internalObject());
}
#endif
void ServerNodeInstance::activateState()
{

4
share/qtcreator/qml/qmlpuppet/instances/servernodeinstance.h
View File

@@ -46,7 +46,9 @@ class QStyleOptionGraphicsItem;
class QDeclarativeContext;
class QGraphicsItem;
class QGraphicsTransform;
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
class QSGItem;
#endif
QT_END_NAMESPACE
namespace QmlDesigner {
@@ -199,7 +201,9 @@ private: // functions
QObject *internalObject() const; // should be not used outside of the nodeinstances!!!!
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
QSGItem *internalSGItem() const;
#endif
private: // variables
QSharedPointer<Internal::ObjectNodeInstance> m_nodeInstance;