diff options
author | Andy Nichols <andy.nichols@theqtcompany.com> | 2016-04-05 12:09:51 +0200 |
---|---|---|
committer | Andy Nichols <andy.nichols@theqtcompany.com> | 2016-04-05 12:11:13 +0200 |
commit | 60da655dff4ffcc94d32a05bb5fa32240b0eaa0b (patch) | |
tree | 3f3f9d427570d505d8249053e9646af69a95e783 /src/imports | |
parent | 17d435fd8b2ed3a8ac6f93d17d0e78cd61bd7851 (diff) | |
parent | fcbbedc3c21ff69d9251264dd708d6ca66c09359 (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I57b06e2e98beb010a56dd0593d93e078ecf76eea
Diffstat (limited to 'src/imports')
-rw-r--r-- | src/imports/testlib/SignalSpy.qml | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/imports/testlib/SignalSpy.qml b/src/imports/testlib/SignalSpy.qml index 7288c57ea0..200fc725f7 100644 --- a/src/imports/testlib/SignalSpy.qml +++ b/src/imports/testlib/SignalSpy.qml @@ -222,14 +222,16 @@ Item { /*! \internal */ function qtest_update() { if (qtest_prevTarget != null) { - var prevFunc = qtest_prevTarget[qtest_prevSignalName] + var prevHandlerName = qtest_signalHandlerName(qtest_prevSignalName) + var prevFunc = qtest_prevTarget[prevHandlerName] if (prevFunc) prevFunc.disconnect(spy.qtest_activated) qtest_prevTarget = null qtest_prevSignalName = "" } if (target != null && signalName != "") { - var func = target[signalName] + var handlerName = qtest_signalHandlerName(signalName) + var func = target[handlerName] if (func === undefined) { spy.qtest_valid = false console.log("Signal '" + signalName + "' not found") @@ -250,4 +252,11 @@ Item { ++qtest_count spy.qtest_signalArguments[spy.qtest_signalArguments.length] = arguments } + + /*! \internal */ + function qtest_signalHandlerName(sn) { + if (sn.substr(0, 2) === "on" && sn[2] === sn[2].toUpperCase()) + return sn + return "on" + sn.substr(0, 1).toUpperCase() + sn.substr(1) + } } |