qt 5.9 compat

Author: Skycoder42

src/datasync/accountmanager_p.cpp

@@ -208,7 +208,7 @@ ExportData AccountManagerPrivate::deserializeExportData(const QJsonObject &impor
 	//cant use json serializer because of HeaderHash and config ptr
 	data.trusted = importData[QStringLiteral("trusted")].toBool();
 	data.pNonce = QByteArray::fromBase64(importData[QStringLiteral("nonce")].toString().toUtf8());
-	data.partnerId = QUuid::fromString(importData[QStringLiteral("partner")].toString());
+	data.partnerId = QUuid(importData[QStringLiteral("partner")].toString());
 	data.scheme = importData[QStringLiteral("scheme")].toString().toUtf8();
 	data.cmac = QByteArray::fromBase64(importData[QStringLiteral("cmac")].toString().toUtf8());
 

tools/appserver/appserver.pro

@@ -41,11 +41,9 @@ SOURCES += \
 DISTFILES += \
 	docker_setup.conf \
 	docker-compose.yaml \
-	dockerbuild/makedocker.sh \
-	dockerbuild/Dockerfile \
+	../../Dockerfile \
 	dockerbuild/env_start.sh \
 	dockerbuild/install.sh \
-	dockerbuild/qt-installer-script.qs \
 	qdsapp.service \
 	qdsapp.socket \
 	qdsapp.conf

tools/appserver/dockerbuild/install.sh

@@ -33,6 +33,7 @@ mv dockerbuild/env_start.sh /usr/bin/
 
 # remove unused stuff
 apt-get -qq purge $BUILD_DEPS
+apt-get -qq autoremove
 rm -rf /tmp/*
 rm -rf /var/lib/apt/lists/*
 rm -rf $HOME/.cache/qpmx