diff options
| author | Niels Ole Salscheider <niels_ole@salscheider-online.de> | 2017-09-03 22:00:29 +0200 |
|---|---|---|
| committer | Niels Ole Salscheider <niels_ole@salscheider-online.de> | 2017-09-04 19:44:01 +0200 |
| commit | 2a5ccd3bd191b75b9fa148a8fa7f3d3ddc225add (patch) | |
| tree | d8cd64a20fbe77a78be7c9533787044157190442 /src/client | |
| parent | 3241e63f07c5fa493788897ddfb87a201205f621 (diff) | |
| download | qxmpp-2a5ccd3bd191b75b9fa148a8fa7f3d3ddc225add.tar.gz | |
Drop support for Qt 4
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/QXmppInvokable.cpp | 12 | ||||
| -rw-r--r-- | src/client/QXmppOutgoingClient.cpp | 6 |
2 files changed, 0 insertions, 18 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('(')); } } diff --git a/src/client/QXmppOutgoingClient.cpp b/src/client/QXmppOutgoingClient.cpp index 552f6f07..b5c7052a 100644 --- a/src/client/QXmppOutgoingClient.cpp +++ b/src/client/QXmppOutgoingClient.cpp @@ -26,11 +26,7 @@ #include <QNetworkProxy> #include <QSslSocket> #include <QUrl> -#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) #include <QDnsLookup> -#else -#include "qdnslookup.h" -#endif #include "QXmppConfiguration.h" #include "QXmppConstants_p.h" @@ -144,10 +140,8 @@ void QXmppOutgoingClientPrivate::connectToHost(const QString &host, quint16 port // respect proxy q->socket()->setProxy(config.networkProxy()); -#if (QT_VERSION >= QT_VERSION_CHECK(4, 8, 0)) // set the name the SSL certificate should match q->socket()->setPeerVerifyName(config.domain()); -#endif // connect to host const QXmppConfiguration::StreamSecurityMode localSecurity = q->configuration().streamSecurityMode(); |