aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/statemachine/signaltransition.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports/statemachine/signaltransition.h')
-rw-r--r--src/imports/statemachine/signaltransition.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/imports/statemachine/signaltransition.h b/src/imports/statemachine/signaltransition.h
index 311195e8e9..3ac563b15e 100644
--- a/src/imports/statemachine/signaltransition.h
+++ b/src/imports/statemachine/signaltransition.h
@@ -38,19 +38,21 @@
#include <QtCore/QVariant>
#include <QtQml/QJSValue>
+#include <QtQml/qqmlscriptstring.h>
+
QT_BEGIN_NAMESPACE
class SignalTransition : public QSignalTransition
{
Q_OBJECT
Q_PROPERTY(QJSValue signal READ signal WRITE setSignal NOTIFY qmlSignalChanged)
- Q_PROPERTY(bool guard READ guard WRITE setGuard NOTIFY guardChanged)
+ Q_PROPERTY(QQmlScriptString guard READ guard WRITE setGuard NOTIFY guardChanged)
public:
explicit SignalTransition(QState *parent = Q_NULLPTR);
- bool guard() const;
- void setGuard(bool guard);
+ QQmlScriptString guard() const;
+ void setGuard(const QQmlScriptString &guard);
bool eventTest(QEvent *event);
@@ -70,7 +72,7 @@ Q_SIGNALS:
private:
QByteArray m_data;
QJSValue m_signal;
- bool m_guard;
+ QQmlScriptString m_guard;
};
QT_END_NAMESPACE