Merge branch 'dev' into gui_qml

client/client.pro

@@ -6,9 +6,9 @@ TEMPLATE = app
 
 DEFINES += QT_DEPRECATED_WARNINGS
 
-include("3rd/QtSsh/src/ssh/ssh.pri")
+include("3rd/QtSsh/src/ssh/qssh.pri")
 include("3rd/QtSsh/src/botan/botan.pri")
-include("3rd/SingleApplication/singleapplication.pri")
+!android:!ios:include("3rd/SingleApplication/singleapplication.pri")
 include("3rd/QRCodeGenerator/QRCodeGenerator.pri")
 
 HEADERS  += \
@@ -112,7 +112,6 @@ win32 {
         -liphlpapi \
         -lgdi32
 
-    #LIBS += -L$$PWD/../../../../../../../OpenSSL-Win32/lib/ -llibcrypto
 }
 
 macx {
@@ -126,3 +125,7 @@ macx {
 
 REPC_REPLICA += ../ipc/ipcinterface.rep
 
+DISTFILES += \
+   android/AndroidManifest.xml
+
+ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android