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>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp
index bf06333c..8c0e69b6 100644
--- a/src/declarative/qml/qdeclarativemetatype.cpp
+++ b/src/declarative/qml/qdeclarativemetatype.cpp
@@ -310,7 +310,7 @@ static void clone(QMetaObjectBuilder &builder, const QMetaObject *mo,
         QMetaMethod method = mo->method(ii);
 
         // More complex - need to search name
-        QByteArray name = method.signature();
+        QByteArray name = method.methodSignature();
         int parenIdx = name.indexOf('(');
         if (parenIdx != -1) name = name.left(parenIdx);
 
@@ -322,7 +322,7 @@ static void clone(QMetaObjectBuilder &builder, const QMetaObject *mo,
              ++ii) {
 
             QMetaMethod other = ignoreEnd->method(ii);
-            QByteArray othername = other.signature();
+            QByteArray othername = other.methodSignature();
             int parenIdx = othername.indexOf('(');
             if (parenIdx != -1) othername = othername.left(parenIdx);