Resolve type names inside guard property of SignalTransition

SignalTransition's guard is evaluated against ad-hoc QQmlContext because
it needs signal args added to its contextProperty.
Since QQmlContext created this way does not have import type cache, we
could not use type names inside guard.
To avoid this problem, this patch makes guard's context inherit parent's
type cahce.

Change-Id: I4ddd559779681b53d4ee42f4820d05438addb5ac
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

diff --git a/src/imports/statemachine/signaltransition.cpp b/src/imports/statemachine/signaltransition.cpp
index 37edd6e..41286d8 100644 (file)
--- a/src/imports/statemachine/signaltransition.cpp
+++ b/src/imports/statemachine/signaltransition.cpp
@@ -44,6 +44,7 @@
 #include <private/qv8engine_p.h>
 #include <private/qjsvalue_p.h>
 #include <private/qv4scopedvalue_p.h>
+#include <private/qqmlcontext_p.h>
 
 SignalTransition::SignalTransition(QState *parent)
     : QSignalTransition(this, SIGNAL(invokeYourself()), parent)
@@ -60,7 +61,10 @@ bool SignalTransition::eventTest(QEvent *event)
     if (m_guard.isEmpty())
         return true;
 
-    QQmlContext context(QQmlEngine::contextForObject(this));
+    QQmlContext *outerContext = QQmlEngine::contextForObject(this);
+    QQmlContext context(outerContext);
+    QQmlContextData::get(outerContext)->imports->addref();
+    QQmlContextData::get(&context)->imports = QQmlContextData::get(outerContext)->imports;
 
     QStateMachine::SignalEvent *e = static_cast<QStateMachine::SignalEvent*>(event);
 

diff --git a/tests/auto/qmltest/statemachine/tst_enumguard.qml b/tests/auto/qmltest/statemachine/tst_enumguard.qml
new file mode 100644 (file)
index 0000000..6e2a107
--- /dev/null
+++ b/tests/auto/qmltest/statemachine/tst_enumguard.qml
@@ -0,0 +1,98 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Ford Motor Company
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the test suite module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtTest 1.1
+import QtQml.StateMachine 1.0
+
+TestCase {
+    id: testCase
+    StateMachine {
+        id: machine
+        initialState: startState
+        State {
+            id: startState
+            SignalTransition {
+                id: signalTrans
+                signal: testCase.mysignal
+                guard: alignment === QState.ParallelStates
+                targetState: finalState
+            }
+        }
+        FinalState {
+            id: finalState
+        }
+    }
+
+    SignalSpy {
+        id: finalStateActive
+        target: finalState
+        signalName: "activeChanged"
+    }
+
+    signal mysignal(int alignment)
+
+    name: "testEnumGuard"
+    function test_enumGuard()
+    {
+        // Start statemachine, should not have reached finalState yet.
+        machine.start()
+        tryCompare(finalStateActive, "count", 0)
+        tryCompare(machine, "running", true)
+
+        // Emit the signalTrans.signal which will evaluate the guard. The
+        // guard should return true, finalState be reached and the
+        // statemachine be stopped.
+        testCase.mysignal(QState.ParallelStates)
+        tryCompare(finalStateActive, "count", 1)
+        tryCompare(machine, "running", false)
+
+        // Restart machine.
+        machine.start()
+        tryCompare(machine, "running", true)
+        tryCompare(finalStateActive, "count", 2)
+
+        // Emit signal that makes the signalTrans.guard return false. The
+        // finalState should not have been triggered.
+        testCase.mysignal(QState.ExclusiveStates)
+        tryCompare(finalStateActive, "count", 2)
+        tryCompare(machine, "running", true)
+    }
+}