diff options
| author | Niels Ole Salscheider <niels_ole@salscheider-online.de> | 2018-06-23 17:20:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-23 17:20:47 +0200 |
| commit | ed6b199dff15ddb4c6bd72d1565501e9f1a2bf87 (patch) | |
| tree | 7bbb53c40ecf53fe9464b53b7966dd7726eeac5e /src/client/QXmppInvokable.cpp | |
| parent | ea83c77a5a4524cc9778336b10eff60979582980 (diff) | |
| parent | 31f0a42073b68823e85835ec3e25114d79705a04 (diff) | |
| download | qxmpp-ed6b199dff15ddb4c6bd72d1565501e9f1a2bf87.tar.gz | |
Merge pull request #131 from olesalscheider/cmake
Add CMake build system, drop Qt4 support
Diffstat (limited to 'src/client/QXmppInvokable.cpp')
| -rw-r--r-- | src/client/QXmppInvokable.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/client/QXmppInvokable.cpp b/src/client/QXmppInvokable.cpp index 39b92f85..e44b6296 100644 --- a/src/client/QXmppInvokable.cpp +++ b/src/client/QXmppInvokable.cpp @@ -58,11 +58,7 @@ QVariant QXmppInvokable::dispatch( const QByteArray & method, const QList< QVari const char *typeName = metaObject()->method(idx).typeName(); int resultType = QMetaType::type(typeName); -#if QT_VERSION >= 0x050000 void *result = QMetaType::create(resultType, 0); -#else - void *result = QMetaType::construct(resultType, 0); -#endif QGenericReturnArgument ret( typeName, result ); QList<QGenericArgument> genericArgs; @@ -115,11 +111,7 @@ 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(); } @@ -133,11 +125,7 @@ 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('(')); } } |