Merge branch 'v1.5' of github.com:QuasarApp/CQtDeployer into v1.5

CQtDeployer.pro

@@ -8,10 +8,11 @@
 TEMPLATE = subdirs
 CONFIG += ordered
 
-lessThan(QT_MAJOR_VERSION, 6):lessThan(QT_MINOR_VERSION, 14) {
-    message(Tests is disabled!)
+lessThan(QT_MAJOR_VERSION, 6):lessThan(QT_MINOR_VERSION, 12) {
+    warning("Tests are only enabled on Qt 5.12.0 or later version. You are using $$[QT_VERSION].")
     DEFINES += WITHOUT_TESTS
 }
+android: DEFINES += WITHOUT_TESTS
 
 !android {
     SUBDIRS += QuasarAppLib \

UnitTests/tst_deploytest.cpp

@@ -2514,7 +2514,9 @@ void deploytest::testSystemLib() {
 
     QVERIFY(runScript.contains("export LD_PRELOAD="));
 
-# else
+#endif
+
+#ifdef Q_OS_WIN
     QString qmake = TestQtDir + "bin/qmake.exe";
     bin = TestBinDir + "QtWidgetsProject.exe";
 

test.pri

@@ -10,12 +10,14 @@ contains(QMAKE_HOST.os, Linux):{
 DEPLOYER=cqtdeployer
 win32:DEPLOYER=$$(cqtdeployer)
 
+test.commands =
 deployTest.commands = $$DEPLOYER -bin $$exec clear -qmake $$QMAKE_BIN -targetDir $$PWD/deployTests -libDir $$PWD -recursiveDepth 4
 
-
-!android:test.depends = deployTest
-unix:!android:test.commands = $$PWD/deployTests/UnitTests.sh -maxwarnings 100000
-win32:test.commands = $$PWD/deployTests/UnitTests.exe -maxwarnings 100000 -o buildLog.log
+!contains(DEFINES, WITHOUT_TESTS) {
+    test.depends = deployTest
+    unix:test.commands = $$PWD/deployTests/UnitTests.sh -maxwarnings 100000
+    win32:test.commands = $$PWD/deployTests/UnitTests.exe -maxwarnings 100000 -o buildLog.log
+}
 
 contains(QMAKE_HOST.os, Linux):{
     win32:test.commands =