diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2016-05-25 16:22:44 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-05-25 17:09:32 +0000 |
commit | 7dcda224fe73cb51a29e8946afd641a989d7209a (patch) | |
tree | 4aa6924e667123ecf25cc5c317064a49658fe8b7 /src/imports/statemachine | |
parent | 0e0535284379e6b740d439fa3dba2e2b5f695756 (diff) |
Fix crash with SignalTransition
Don't crash when using SignalTransition with a signal object instead of the
slot used to emit the signal. A signal object is just as good.
Task-number: QTBUG-53596
Change-Id: I8a419d16ec0c257c9a798a83ee5bad338794cdd2
Reviewed-by: Michael Brasser <michael.brasser@live.com>
Diffstat (limited to 'src/imports/statemachine')
-rw-r--r-- | src/imports/statemachine/signaltransition.cpp | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/src/imports/statemachine/signaltransition.cpp b/src/imports/statemachine/signaltransition.cpp index 33ee11cbe7..4f6c769324 100644 --- a/src/imports/statemachine/signaltransition.cpp +++ b/src/imports/statemachine/signaltransition.cpp @@ -105,15 +105,27 @@ void SignalTransition::setSignal(const QJSValue &signal) QV4::ExecutionEngine *jsEngine = QV8Engine::getV4(QQmlEngine::contextForObject(this)->engine()); QV4::Scope scope(jsEngine); - QV4::Scoped<QV4::QObjectMethod> qobjectSignal(scope, QJSValuePrivate::convertedToValue(jsEngine, m_signal)); - Q_ASSERT(qobjectSignal); - - QObject *sender = qobjectSignal->object(); - Q_ASSERT(sender); - QMetaMethod metaMethod = sender->metaObject()->method(qobjectSignal->methodIndex()); + QObject *sender; + QMetaMethod signalMethod; + + QV4::ScopedValue value(scope, QJSValuePrivate::convertedToValue(jsEngine, m_signal)); + + // Did we get the "slot" that can be used to invoke the signal? + if (QV4::QObjectMethod *signalSlot = value->as<QV4::QObjectMethod>()) { + sender = signalSlot->object(); + Q_ASSERT(sender); + signalMethod = sender->metaObject()->method(signalSlot->methodIndex()); + } else if (QV4::QmlSignalHandler *signalObject = value->as<QV4::QmlSignalHandler>()) { // or did we get the signal object (the one with the connect()/disconnect() functions) ? + sender = signalObject->object(); + Q_ASSERT(sender); + signalMethod = sender->metaObject()->method(signalObject->signalIndex()); + } else { + qmlInfo(this) << tr("Specified signal does not exist."); + return; + } QSignalTransition::setSenderObject(sender); - QSignalTransition::setSignal(metaMethod.methodSignature()); + QSignalTransition::setSignal(signalMethod.methodSignature()); connectTriggered(); } |