Merge pull request #131 from olesalscheider/cmake

Add CMake build system, drop Qt4 support

3 files changed, 0 insertions, 64 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();
diff --git a/src/client/client.pri b/src/client/client.pri
deleted file mode 100644
index bfb3094f..00000000
--- a/src/client/client.pri
+++ /dev/null
@@ -1,46 +0,0 @@
-# Header files
-INSTALL_HEADERS += \
-    client/QXmppArchiveManager.h \
-    client/QXmppBookmarkManager.h \
-    client/QXmppCallManager.h \
-    client/QXmppCarbonManager.h \
-    client/QXmppClient.h \
-    client/QXmppClientExtension.h \
-    client/QXmppConfiguration.h \
-    client/QXmppDiscoveryManager.h \
-    client/QXmppEntityTimeManager.h \
-    client/QXmppInvokable.h \
-    client/QXmppMamManager.h \
-    client/QXmppMessageReceiptManager.h \
-    client/QXmppMucManager.h \
-    client/QXmppOutgoingClient.h \
-    client/QXmppRemoteMethod.h \
-    client/QXmppRosterManager.h \
-    client/QXmppRpcManager.h \
-    client/QXmppTransferManager.h \
-    client/QXmppTransferManager_p.h \
-    client/QXmppVCardManager.h \
-    client/QXmppVersionManager.h
-
-# Source files
-SOURCES += \
-    client/QXmppDiscoveryManager.cpp \
-    client/QXmppArchiveManager.cpp \
-    client/QXmppBookmarkManager.cpp \
-    client/QXmppCallManager.cpp \
-    client/QXmppCarbonManager.cpp \
-    client/QXmppClient.cpp \
-    client/QXmppClientExtension.cpp \
-    client/QXmppConfiguration.cpp \
-    client/QXmppEntityTimeManager.cpp \
-    client/QXmppInvokable.cpp \
-    client/QXmppMamManager.cpp \
-    client/QXmppMessageReceiptManager.cpp \
-    client/QXmppMucManager.cpp \
-    client/QXmppOutgoingClient.cpp \
-    client/QXmppRemoteMethod.cpp \
-    client/QXmppRosterManager.cpp \
-    client/QXmppRpcManager.cpp \
-    client/QXmppTransferManager.cpp \
-    client/QXmppVCardManager.cpp \
-    client/QXmppVersionManager.cpp