Fix build with Qt5 (Fixes issue #142)

2 files changed, 9 insertions, 0 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 43993cf0..1de16ca6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,7 @@ QXmpp 0.5.0 (UNRELEASED)
     * Issue 64: Compile qxmpp as shared library by default
     * Issue 79: Export classes for Visual C++ Compiler
     * Issue 140: Proper XEP-0115 ver string generation with dataforms
+    * Issue 142: qxmpp does not build in Qt5
 
 QXmpp 0.4.0 (Apr 12, 2012)
 --------------------------
diff --git a/src/client/QXmppInvokable.cpp b/src/client/QXmppInvokable.cpp
index 10815734..0bd46f34 100644
--- a/src/client/QXmppInvokable.cpp
+++ b/src/client/QXmppInvokable.cpp
@@ -110,7 +110,11 @@ void QXmppInvokable::buildMethodHash( )
     int methodCount = metaObject()->methodCount ();
     for( int idx = 0; idx < methodCount; ++idx)
     {
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+        QByteArray signature = metaObject()->method(idx).methodSignature();
+#else
         QByteArray signature = metaObject()->method(idx).signature();
+#endif
         m_methodHash[signature.left(signature.indexOf('('))] = idx;
 //         qDebug() << metaObject()->method(idx).parameterTypes();
     }
@@ -124,7 +128,11 @@ QStringList QXmppInvokable::interfaces( ) const
     {
         if( metaObject()->method(idx).methodType() == QMetaMethod::Slot )
         {
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+            QByteArray signature = metaObject()->method(idx).methodSignature();
+#else
             QByteArray signature = metaObject()->method(idx).signature();
+#endif
             results << signature.left(signature.indexOf('('));
         }
     }