From 2da32199092bcb8713c9d511ac888495fd127a40 Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Thu, 1 Sep 2011 09:17:27 +0200 Subject: [PATCH] qmlpuppet: Fix build with Qt 4.7.4. Change-Id: I74f0784d76f8fa7137db22a251deaab9d99481dd Reviewed-on: http://codereview.qt.nokia.com/4040 Reviewed-by: Kai Koehne --- .../qtcreator/qml/qmlpuppet/instances/servernodeinstance.cpp | 4 ++++ share/qtcreator/qml/qmlpuppet/instances/servernodeinstance.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/share/qtcreator/qml/qmlpuppet/instances/servernodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/instances/servernodeinstance.cpp index 3f3996f610e..b84ec0003bf 100644 --- a/share/qtcreator/qml/qmlpuppet/instances/servernodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/instances/servernodeinstance.cpp @@ -54,7 +54,9 @@ #include #include +#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) #include +#endif #include @@ -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(internalObject()); } +#endif void ServerNodeInstance::activateState() { diff --git a/share/qtcreator/qml/qmlpuppet/instances/servernodeinstance.h b/share/qtcreator/qml/qmlpuppet/instances/servernodeinstance.h index 1037334bf11..ed6ccd3a0ab 100644 --- a/share/qtcreator/qml/qmlpuppet/instances/servernodeinstance.h +++ b/share/qtcreator/qml/qmlpuppet/instances/servernodeinstance.h @@ -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 m_nodeInstance;