1 files changed, 4 insertions, 11 deletions
diff --git a/src/corelib/statemachine/qabstracttransition.cpp b/src/corelib/statemachine/qabstracttransition.cpp
index 670aa7d6e..0004d3e12 100644
--- a/src/corelib/statemachine/qabstracttransition.cpp
+++ b/src/corelib/statemachine/qabstracttransition.cpp
@@ -115,13 +115,10 @@ QAbstractTransitionPrivate *QAbstractTransitionPrivate::get(QAbstractTransition
 
 QStateMachine *QAbstractTransitionPrivate::machine() const
 {
-    QObject *par = parent;
-    while (par != 0) {
-        if (QStateMachine *mach = qobject_cast<QStateMachine*>(par))
-            return mach;
-        par = par->parent();
-    }
-    return 0;
+    QState *source = sourceState();
+    if (!source)
+        return 0;
+    return source->machine();
 }
 
 bool QAbstractTransitionPrivate::callEventTest(QEvent *e)
@@ -256,10 +253,6 @@ void QAbstractTransition::setTargetStates(const QList<QAbstractState*> &targets)
             qWarning("QAbstractTransition::setTargetStates: target state(s) cannot be null");
             return;
         }
-        if (target->machine() != 0 && target->machine()->rootState() == target) {
-            qWarning("QAbstractTransition::setTargetStates: root state cannot be target of transition");
-            return;
-        }
     }
 
     d->targetStates.clear();