diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancemetaobject.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancemetaobject.cpp index 8fbd5e36a24..5ffdd8c1856 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancemetaobject.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancemetaobject.cpp @@ -109,15 +109,6 @@ static QQmlPropertyCache *cacheForObject(QObject *object, QQmlEngine *engine) return QQmlEnginePrivate::get(engine)->cache(object); } -static QAbstractDynamicMetaObject *abstractDynamicMetaObject(QObject *object) -{ - QObjectPrivate *op = QObjectPrivate::get(object); - if (op->metaObject) - return static_cast(op->metaObject); - return const_cast(static_cast(object->metaObject())); -} - - NodeInstanceMetaObject *NodeInstanceMetaObject::createNodeInstanceMetaObject(const ObjectNodeInstancePointer &nodeInstance, QQmlEngine *engine) { //Avoid setting up multiple NodeInstanceMetaObjects on the same QObject @@ -187,8 +178,8 @@ NodeInstanceMetaObject::NodeInstanceMetaObject(const ObjectNodeInstance::Pointer NodeInstanceMetaObject::NodeInstanceMetaObject(const ObjectNodeInstancePointer &nodeInstance, QObject *object, const QString &prefix, QQmlEngine *engine) : QQmlVMEMetaObject(object, cacheForObject(object, engine), vMEMetaDataForObject(object)), m_nodeInstance(nodeInstance), - m_context(engine->contextForObject(object)), m_prefix(prefix), + m_context(engine->contextForObject(object)), m_data(new MetaPropertyData), m_cache(0) diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp index d74a517fbc9..7ef12724be9 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp @@ -51,7 +51,7 @@ #include #include #include -#include +#include #include namespace QmlDesigner { @@ -712,7 +712,7 @@ static void stopAnimation(QObject *object) QQuickTransition *transition = qobject_cast(object); QQuickAbstractAnimation *animation = qobject_cast(object); - QQuickTimer *timer = qobject_cast(object); + QQmlTimer *timer = qobject_cast(object); if (transition) { transition->setFromState(""); transition->setToState(""); diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp index 25c34efb40b..d9f8594798d 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp @@ -143,7 +143,7 @@ bool QuickItemNodeInstance::childItemsHaveContent(QQuickItem *quickItem) QPointF QuickItemNodeInstance::position() const { - return quickItem()->pos(); + return quickItem()->position(); } static QTransform transformForItem(QQuickItem *item, NodeInstanceServer *nodeInstanceServer)