summaryrefslogtreecommitdiffstats
path: root/src/declarative/debugger
diff options
context:
space:
mode:
authorKent Hansen <kent.hansen@nokia.com>2012-02-23 20:41:53 +0100
committerQt by Nokia <qt-info@nokia.com>2012-04-18 11:47:17 +0200
commit6d3676e877da86d9ec8d4c5094ec19c38a6649e7 (patch)
treebdcd861841b385f1f28f90404055ed5bf3bd7f02 /src/declarative/debugger
parentd2e40f5dbd6d1a550bc70a7adb8511788eeca031 (diff)
Adapt to Qt5 meta-object changes
QMetaMethod::signature() has been renamed to methodSignature(), and returns a QByteArray, not const char *. Thew new function QMetaMethod::isValid() should be used to check whether a method is valid (it's a lot cheaper than calling signature()). Also use the new QMetaObject::checkConnectArgs() overload that takes QMetaMethods, not strings, as arguments. Further improvements can be made by using the new functions QMetaMethod::name(), parameterCount() and parameterTypes(), but that will be done in separate commits. Change-Id: I3e4cfbdc7799d8bce747ef37f07d0d097370e409 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Diffstat (limited to 'src/declarative/debugger')
-rw-r--r--src/declarative/debugger/qdeclarativeenginedebugservice.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/debugger/qdeclarativeenginedebugservice.cpp b/src/declarative/debugger/qdeclarativeenginedebugservice.cpp
index d3ad07d6..13be5a8e 100644
--- a/src/declarative/debugger/qdeclarativeenginedebugservice.cpp
+++ b/src/declarative/debugger/qdeclarativeenginedebugservice.cpp
@@ -226,7 +226,7 @@ void QDeclarativeEngineDebugService::buildObjectDump(QDataStream &message,
prop.value = expr->expression();
QObject *scope = expr->scopeObject();
if (scope) {
- QString sig = QLatin1String(scope->metaObject()->method(signal->index()).signature());
+ QString sig = QString::fromLatin1(scope->metaObject()->method(signal->index()).methodSignature());
int lparen = sig.indexOf(QLatin1Char('('));
if (lparen >= 0) {
QString methodName = sig.mid(0, lparen);