Merge remote-tracking branch 'upstream/master' into message_log

Conflicts:
	servatrice/CMakeLists.txt

servatrice/src/servatrice.h

@@ -68,7 +68,11 @@ public:
 	Servatrice_IslServer(Servatrice *_server, const QSslCertificate &_cert, const QSslKey &_privateKey, QObject *parent = 0)
 		: QTcpServer(parent), server(_server), cert(_cert), privateKey(_privateKey) { }
 protected:
+#if QT_VERSION < 0x050000
 	void incomingConnection(int socketDescriptor);
+#else
+	void incomingConnection(qintptr socketDescriptor);
+#endif
 };
 
 class ServerProperties {

travis-compile.sh

@@ -6,7 +6,7 @@ mkdir build
 cd build
 prefix=""
 if [[ $TRAVIS_OS_NAME == "osx" && $QT4 == 0 ]]; then
-  prefix="-DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.3.2/"
+  prefix="-DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.4.0/"
 fi
 cmake .. -DWITH_SERVER=1 -DWITH_QT4=$QT4 $prefix
 make