diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2013-10-21 14:43:19 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-22 13:51:33 +0200 |
| commit | 4f1ed0948b99af617fa978f0f1b72e48a9fe774f (patch) | |
| tree | ca86faa0d50098b4b527519af691c38654fbe77d /tests/auto/qml/qqmlecmascript/testtypes.h | |
| parent | bf245797a7b14d8c40cd9f2a12620690ef20094e (diff) | |
Avoid crash when a QML signal is connected to a non-void slot
Don't pass a QVariant pointer for the return value when we're
not interested in it and the return type might not even be a
QVariant (that would be only true for QML methods).
Task-number: QTBUG-32801
Change-Id: I8f14e40d8f94caef7e3d086b776735f0484dbf0e
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'tests/auto/qml/qqmlecmascript/testtypes.h')
| -rw-r--r-- | tests/auto/qml/qqmlecmascript/testtypes.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmlecmascript/testtypes.h b/tests/auto/qml/qqmlecmascript/testtypes.h index c6f6de7337..0fdcdafb95 100644 --- a/tests/auto/qml/qqmlecmascript/testtypes.h +++ b/tests/auto/qml/qqmlecmascript/testtypes.h @@ -268,6 +268,7 @@ public slots: void qjsvalueMethod(const QJSValue &v) { m_qjsvalue = v; } void v8function(QQmlV4Function*); void registeredFlagMethod(Qt::MouseButtons v) { m_buttons = v; } + QString slotWithReturnValue(const QString &arg) { return arg; } private: friend class tst_qqmlecmascript; |