fixes for Qt 5.11.0 (mostly ro)

Author: Skycoder42

src/datasync/datasync.pro

@@ -1,6 +1,6 @@
 TARGET = QtDataSync
 
-QT = core jsonserializer sql websockets scxml remoteobjects
+QT = core jsonserializer sql websockets scxml remoteobjects remoteobjects-private
 
 HEADERS += \
 	qtdatasync_global.h \

src/datasync/rothreadedbackend/threadedclient.cpp

@@ -55,16 +55,22 @@ void ThreadedClientIoDevice::connectToServer()
 		emit shouldReconnect(this);
 }
 
-bool ThreadedClientIoDevice::isOpen()
+bool ThreadedClientIoDevice::isOpen() const
 {
 	return !isClosing() && _buffer->isOpen();
 }
 
-QIODevice *ThreadedClientIoDevice::connection()
+QIODevice *ThreadedClientIoDevice::connection() const
 {
 	return _buffer;
 }
 
+void ThreadedClientIoDevice::doDisconnectFromServer()
+{
+	if(_buffer->isOpen())
+		_buffer->close();
+}
+
 void ThreadedClientIoDevice::doClose()
 {
 	if(_buffer->isOpen())

src/datasync/rothreadedbackend/threadedclient_p.h

@@ -4,7 +4,7 @@
 #include <QtCore/QUrl>
 #include <QtCore/QTimer>
 
-#include <QtRemoteObjects/QtROServerFactory>
+#include <QtRemoteObjects/private/qconnectionfactories_p.h>
 
 #include "qtdatasync_global.h"
 
@@ -21,10 +21,11 @@ class Q_DATASYNC_EXPORT ThreadedClientIoDevice : public ClientIoDevice
 	~ThreadedClientIoDevice();
 
 	void connectToServer() override;
-	bool isOpen() override;
-	QIODevice *connection() override;
+	bool isOpen() const override;
+	QIODevice *connection() const override;
 
 protected:
+	void doDisconnectFromServer() override;
 	void doClose() override;
 
 private Q_SLOTS:

src/datasync/rothreadedbackend/threadedserver_p.h

@@ -4,7 +4,7 @@
 #include <QtCore/QUrl>
 #include <QtCore/QMutex>
 
-#include <QtRemoteObjects/QtROServerFactory>
+#include <QtRemoteObjects/private/qconnectionfactories_p.h>
 
 #include "qtdatasync_global.h"
 #include "exchangebuffer_p.h"

src/imports/datasync/datasync.pro

@@ -27,7 +27,7 @@ OTHER_FILES += qmldir
 
 generate_qmltypes {
 	typeextra1.target = qmltypes
-	typeextra1.depends += export LD_LIBRARY_PATH := "$$shadowed($$dirname(_QMAKE_CONF_))/lib/:$(LD_LIBRARY_PATH)"
+	typeextra1.depends += export LD_LIBRARY_PATH := "$$shadowed($$dirname(_QMAKE_CONF_))/lib/:$$[QT_INSTALL_LIBS]:$(LD_LIBRARY_PATH)"
 	typeextra2.target = qmltypes
 	typeextra2.depends += export QML2_IMPORT_PATH := "$$shadowed($$dirname(_QMAKE_CONF_))/qml/"
 	QMAKE_EXTRA_TARGETS += typeextra1 typeextra2