diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.cpp index c751f232a7f..d22bd5376be 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.cpp @@ -30,7 +30,7 @@ #include "behaviornodeinstance.h" -#include +#include namespace QmlDesigner { namespace Internal { @@ -43,15 +43,11 @@ BehaviorNodeInstance::BehaviorNodeInstance(QObject *object) BehaviorNodeInstance::Pointer BehaviorNodeInstance::create(QObject *object) { - QQuickBehavior* behavior = qobject_cast(object); - - Q_ASSERT(behavior); - - Pointer instance(new BehaviorNodeInstance(behavior)); + Pointer instance(new BehaviorNodeInstance(object)); instance->populateResetHashes(); - behavior->setEnabled(false); + QmlPrivateGate::disableBehaivour(object); return instance; } diff --git a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.cpp b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.cpp index 9d941a62e3b..93c9296fb39 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.cpp +++ b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.cpp @@ -42,8 +42,9 @@ #include #include -#include #include +#include +#include #include #include #include @@ -564,6 +565,13 @@ void disableTransition(QObject *object) transition->setFromState("invalidState"); } +void disableBehaivour(QObject *object) +{ + QQuickBehavior* behavior = qobject_cast(object); + Q_ASSERT(behavior); + behavior->setEnabled(false); +} + ComponentCompleteDisabler::ComponentCompleteDisabler() { DesignerSupport::disableComponentComplete(); diff --git a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.h b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.h index 206734aeeaa..04670ce4aa2 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.h +++ b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.h @@ -97,6 +97,7 @@ public: void disableNativeTextRendering(QQuickItem *item); void disableTextCursor(QQuickItem *item); void disableTransition(QObject *object); + void disableBehaivour(QObject *object); } // namespace QmlPrivateGate } // namespace Internal