diff options
| author | Sami Shalayel <sami.shalayel@qt.io> | 2023-08-09 09:30:22 +0200 |
|---|---|---|
| committer | Sami Shalayel <sami.shalayel@qt.io> | 2023-08-10 19:55:40 +0200 |
| commit | 3dbf52797b7cfeb2ba0f8f046cc9fff59f080a69 (patch) | |
| tree | bc75e5927757bb54398d8b34ca8a268a3ccbe87e /src/qmltest | |
| parent | a130481af21af38f931b98a33b84eaa0637e69c7 (diff) | |
SignalSpy: use QQmlSignalNames
Use QQmlSignalNames to do signal handler name manipulations in
SignalSpy.qml
Change-Id: I35a61f3eca7425a8c1e4c1d9acb46efc1daaa2ad
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Semih Yavuz <semih.yavuz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qmltest')
| -rw-r--r-- | src/qmltest/SignalSpy.qml | 4 | ||||
| -rw-r--r-- | src/qmltest/quicktestutil_p.h | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/qmltest/SignalSpy.qml b/src/qmltest/SignalSpy.qml index dd6c8ec892..029003c70f 100644 --- a/src/qmltest/SignalSpy.qml +++ b/src/qmltest/SignalSpy.qml @@ -232,8 +232,6 @@ Item { /*! \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) + return util.signalHandlerName(sn) } } diff --git a/src/qmltest/quicktestutil_p.h b/src/qmltest/quicktestutil_p.h index 2c06f37224..028864b5b1 100644 --- a/src/qmltest/quicktestutil_p.h +++ b/src/qmltest/quicktestutil_p.h @@ -19,6 +19,7 @@ #include <QtCore/qobject.h> #include <QtQml/qqml.h> +#include <QtQml/private/qqmlsignalnames_p.h> #include <QtQml/qjsvalue.h> QT_BEGIN_NAMESPACE @@ -50,6 +51,13 @@ public Q_SLOTS: QJSValue callerFile(int frameIndex = 0) const; int callerLine(int frameIndex = 0) const; + + QString signalHandlerName(const QString &signalName) + { + if (QQmlSignalNames::isHandlerName(signalName)) + return signalName; + return QQmlSignalNames::signalNameToHandlerName(signalName); + } }; QT_END_NAMESPACE |