Merge pull request #131 from olesalscheider/cmake

Add CMake build system, drop Qt4 support

5 files changed, 26 insertions, 35 deletions

diff --git a/src/server/QXmppOutgoingServer.cpp b/src/server/QXmppOutgoingServer.cpp
index 3855da4d..2da1628a 100644
--- a/src/server/QXmppOutgoingServer.cpp
+++ b/src/server/QXmppOutgoingServer.cpp
@@ -25,11 +25,7 @@
 #include <QSslKey>
 #include <QSslSocket>
 #include <QTimer>
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
 #include <QDnsLookup>
-#else
-#include "qdnslookup.h"
-#endif
 
 #include "QXmppConstants_p.h"
 #include "QXmppDialback.h"
@@ -137,10 +133,8 @@ void QXmppOutgoingServer::_q_dnsLookupFinished()
         port = 5269;
     }
 
-#if (QT_VERSION >= QT_VERSION_CHECK(4, 8, 0))
     // set the name the SSL certificate should match
     socket()->setPeerVerifyName(d->remoteDomain);
-#endif
 
     // connect to server
     info(QString("Connecting to %1:%2").arg(host, QString::number(port)));
diff --git a/src/server/QXmppServer.cpp b/src/server/QXmppServer.cpp
index 13be2169..73a7415e 100644
--- a/src/server/QXmppServer.cpp
+++ b/src/server/QXmppServer.cpp
@@ -891,11 +891,7 @@ QXmppSslServer::~QXmppSslServer()
     delete d;
 }
 
-#if QT_VERSION < 0x050000
-void QXmppSslServer::incomingConnection(int socketDescriptor)
-#else
 void QXmppSslServer::incomingConnection(qintptr socketDescriptor)
-#endif
 {
     QSslSocket *socket = new QSslSocket;
     if (!socket->setSocketDescriptor(socketDescriptor)) {
diff --git a/src/server/QXmppServer.h b/src/server/QXmppServer.h
index f6866f92..992f0c4a 100644
--- a/src/server/QXmppServer.h
+++ b/src/server/QXmppServer.h
@@ -143,11 +143,7 @@ signals:
     void newConnection(QSslSocket *socket);
 
 private:
-    #if QT_VERSION < 0x050000
-    void incomingConnection(int socketDescriptor);
-    #else
-    void incomingConnection(qintptr socketDescriptor);
-    #endif
+    void incomingConnection(qintptr socketDescriptor) override;
     QXmppSslServerPrivate * const d;
 };
 
diff --git a/src/server/QXmppServerPlugin.cpp b/src/server/QXmppServerPlugin.cpp
new file mode 100644
index 00000000..d723ee4d
--- /dev/null
+++ b/src/server/QXmppServerPlugin.cpp
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2017 The QXmpp developers
+ *
+ * Author:
+ *  Niels Ole Salscheider
+ *
+ * Source:
+ *  https://github.com/qxmpp-project/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+#include "QXmppServerPlugin.h"
+
diff --git a/src/server/server.pri b/src/server/server.pri
deleted file mode 100644
index 718119a8..00000000
--- a/src/server/server.pri
+++ /dev/null
@@ -1,20 +0,0 @@
-# Headers
-INSTALL_HEADERS += \
-    server/QXmppDialback.h \
-    server/QXmppIncomingClient.h \
-    server/QXmppIncomingServer.h \
-    server/QXmppOutgoingServer.h \
-    server/QXmppPasswordChecker.h \
-    server/QXmppServer.h \
-    server/QXmppServerExtension.h \
-    server/QXmppServerPlugin.h
-
-# Source files
-SOURCES += \
-    server/QXmppDialback.cpp \
-    server/QXmppIncomingClient.cpp \
-    server/QXmppIncomingServer.cpp \
-    server/QXmppOutgoingServer.cpp \
-    server/QXmppPasswordChecker.cpp \
-    server/QXmppServer.cpp \
-    server/QXmppServerExtension.cpp