diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.cpp index 59c8fe354b3..6289e09619a 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.cpp @@ -29,28 +29,23 @@ ****************************************************************************/ #include "qmltransitionnodeinstance.h" -#include + +#include namespace QmlDesigner { namespace Internal { -QmlTransitionNodeInstance::QmlTransitionNodeInstance(QQuickTransition *transition) +QmlTransitionNodeInstance::QmlTransitionNodeInstance(QObject *transition) : ObjectNodeInstance(transition) { } QmlTransitionNodeInstance::Pointer QmlTransitionNodeInstance::create(QObject *object) { - QQuickTransition *transition = qobject_cast(object); - - Q_ASSERT(transition); - - Pointer instance(new QmlTransitionNodeInstance(transition)); + Pointer instance(new QmlTransitionNodeInstance(object)); instance->populateResetHashes(); - - transition->setToState("invalidState"); - transition->setFromState("invalidState"); + QmlPrivateGate::disableTransition(object); return instance; } @@ -65,10 +60,5 @@ PropertyNameList QmlTransitionNodeInstance::ignoredProperties() const return PropertyNameList() << "from" << "to"; } -QQuickTransition *QmlTransitionNodeInstance::qmlTransition() const -{ - Q_ASSERT(qobject_cast(object())); - return static_cast(object()); -} } } diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.h index 66708c5bdb6..69b67228e7c 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.h @@ -33,10 +33,6 @@ #include "objectnodeinstance.h" -QT_BEGIN_NAMESPACE -class QQuickTransition; -QT_END_NAMESPACE - namespace QmlDesigner { namespace Internal { @@ -52,11 +48,8 @@ public: PropertyNameList ignoredProperties() const Q_DECL_OVERRIDE; -protected: - QQuickTransition *qmlTransition() const; - private: - QmlTransitionNodeInstance(QQuickTransition *transition); + QmlTransitionNodeInstance(QObject *transition); }; } } diff --git a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.cpp b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.cpp index 4b72bac0965..9d941a62e3b 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.cpp +++ b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.cpp @@ -47,6 +47,7 @@ #include #include #include +#include #include @@ -555,6 +556,14 @@ void disableTextCursor(QQuickItem *item) textEdit->setCursorVisible(false); } +void disableTransition(QObject *object) +{ + QQuickTransition *transition = qobject_cast(object); + Q_ASSERT(transition); + transition->setToState("invalidState"); + transition->setFromState("invalidState"); +} + ComponentCompleteDisabler::ComponentCompleteDisabler() { DesignerSupport::disableComponentComplete(); diff --git a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.h b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.h index eb60ad7d73d..206734aeeaa 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.h +++ b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.h @@ -96,6 +96,7 @@ public: bool objectWasDeleted(QObject *object); void disableNativeTextRendering(QQuickItem *item); void disableTextCursor(QQuickItem *item); + void disableTransition(QObject *object); } // namespace QmlPrivateGate } // namespace Internal