diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-04-17 16:35:19 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2012-04-17 22:32:42 +0200 |
| commit | 7d3a56f3cf717a06823c33b031ea4f590e14002d (patch) | |
| tree | b5d2845e8353ba2de3028a9f32749ca622e115da /src/qml/debugger | |
| parent | f92c3aecd08eef468f9a47f2e970f22beecc8216 (diff) | |
| parent | e5f45d9b57bb0542ec47e5a8a4e57388b6d59d35 (diff) | |
Merge remote-tracking branch 'origin/api_changes'
Change-Id: I39905acde16ba6bb0ba39401cb73082a73dd9167
Diffstat (limited to 'src/qml/debugger')
| -rw-r--r-- | src/qml/debugger/qqmlenginedebugservice.cpp | 6 | ||||
| -rw-r--r-- | src/qml/debugger/qqmlprofilerservice_p.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/qml/debugger/qqmlenginedebugservice.cpp b/src/qml/debugger/qqmlenginedebugservice.cpp index 4938347b9b..d8997fd587 100644 --- a/src/qml/debugger/qqmlenginedebugservice.cpp +++ b/src/qml/debugger/qqmlenginedebugservice.cpp @@ -271,10 +271,8 @@ void QQmlEngineDebugService::buildObjectDump(QDataStream &message, prop.value = expr->expression(); QObject *scope = expr->scopeObject(); if (scope) { - QString sig = QString::fromLatin1(scope->metaObject()->method(signalHandler->index()).signature()); - int lparen = sig.indexOf(QLatin1Char('(')); - if (lparen >= 0) { - QString methodName = sig.mid(0, lparen); + QString methodName = QString::fromLatin1(scope->metaObject()->method(signalHandler->index()).name()); + if (!methodName.isEmpty()) { prop.name = QLatin1String("on") + methodName[0].toUpper() + methodName.mid(1); } diff --git a/src/qml/debugger/qqmlprofilerservice_p.h b/src/qml/debugger/qqmlprofilerservice_p.h index 88a965e6c1..8662abb52e 100644 --- a/src/qml/debugger/qqmlprofilerservice_p.h +++ b/src/qml/debugger/qqmlprofilerservice_p.h @@ -209,7 +209,7 @@ struct QQmlHandlingSignalProfiler { QQmlProfilerService *service = QQmlProfilerService::instance; service->startRange(QQmlProfilerService::HandlingSignal); service->rangeData(QQmlProfilerService::HandlingSignal, - QLatin1String(signal.signature()) + QLatin1String(": ") + QString::fromLatin1(signal.methodSignature()) + QLatin1String(": ") + expression->expression()); service->rangeLocation(QQmlProfilerService::HandlingSignal, expression->sourceFile(), expression->lineNumber(), |