From f0438be2ea805e6b6e8bd701ac42a161cc9367c0 Mon Sep 17 00:00:00 2001
From: "a.yankovich" <EndrIIMail@gmail.com>
Date: Tue, 4 Feb 2020 16:51:00 +0300
Subject: [PATCH] fix build on windows and android
---
CQtDeployer.pro | 3 ++-
test.pri | 5 ++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/CQtDeployer.pro b/CQtDeployer.pro
index 48aba3d..6a8497a 100644
--- a/CQtDeployer.pro
+++ b/CQtDeployer.pro
@@ -16,7 +16,7 @@ SUBDIRS += QuasarAppLib \
tests/TestOnlyC \
tests/TestQtWidgets \
tests/TestQMLWidgets
-}
+
contains(DEFINES, WITH_ALL_TESTS) {
SUBDIRS += tests/quicknanobrowser
@@ -45,3 +45,4 @@ DISTFILES += \
README.md \
+}
diff --git a/test.pri b/test.pri
index 806e372..7a0f5c9 100644
--- a/test.pri
+++ b/test.pri
@@ -3,11 +3,14 @@ win32:exec = $$PWD/UnitTests/build/release/UnitTests.exe
QT_DIR= $$[QT_HOST_BINS]
win32:QMAKE_BIN= $$QT_DIR/qmake.exe
+win32:DEPLOYER= %cqtdeployer%
contains(QMAKE_HOST.os, Linux):{
QMAKE_BIN= $$QT_DIR/qmake
+ win32:DEPLOYER= cqtdeployer
+
}
-deployTest.commands = cqtdeployer -bin $$exec clear -qmake $$QMAKE_BIN -targetDir $$PWD/deployTests -libDir $$PWD -recursiveDepth 4
+deployTest.commands = $$DEPLOYER -bin $$exec clear -qmake $$QMAKE_BIN -targetDir $$PWD/deployTests -libDir $$PWD -recursiveDepth 4
test.depends = deployTest