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