diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2012-05-16 12:31:59 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-17 08:58:45 +0200 |
commit | 9af1a7d0aee4f9ed48b2519779388830a8dd03e9 (patch) | |
tree | 1f4d5149781f211f3fb7e8ca54180035f9a3f780 /tests/auto/qml/qqmllanguage/data | |
parent | 8236ca1aedabccf4bda4d0e3873ace8b48c522d6 (diff) |
Fix signal handlers for signals with default arguments.
For cloned signals, connect to the index of the original. This was a
regression caused by the switch to QQmlNotifierEndpoint for signal
handlers. This change also makes parameters with default arguments
available from QML, while previously they were unavailable.
Change-Id: I1feb3412c3e9b0f2a5d6644c404c56d53c5544ac
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/qml/qqmllanguage/data')
-rw-r--r-- | tests/auto/qml/qqmllanguage/data/signalWithDefaultArg.qml | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmllanguage/data/signalWithDefaultArg.qml b/tests/auto/qml/qqmllanguage/data/signalWithDefaultArg.qml new file mode 100644 index 0000000000..e9f86fe6ca --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/signalWithDefaultArg.qml @@ -0,0 +1,23 @@ +import Test 1.0 +import QtQuick 2.0 + +MyQmlObject { + property real signalCount: 0 + property real signalArg: 0 + + signal noArgSignal + signal argSignal(real arg) + + function emitNoArgSignal() { noArgSignal(); } + function emitArgSignal() { argSignal(22); } + + onSignalWithDefaultArg: { + signalArg = parameter + signalCount++ + } + + Component.onCompleted: { + noArgSignal.connect(signalWithDefaultArg) + argSignal.connect(signalWithDefaultArg) + } +} |