QuasarApp/CQtDeployer
4
1
Fork 0
mirror of https://github.com/QuasarApp/CQtDeployer.git synced 2025-05-03 21:19:34 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andrei Yankovich 2021-02-12 16:18:59 +03:00
commit caa839089d
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CQtDeployer.pro
View File

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

4
UnitTests/tst_deploytest.cpp
View File

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

8
test.pri
View File

@ -10,12 +10,14 @@ contains(QMAKE_HOST.os, Linux):{
DEPLOYER=cqtdeployer DEPLOYER=cqtdeployer
win32:DEPLOYER=$$(cqtdeployer) win32:DEPLOYER=$$(cqtdeployer)
test.commands =
deployTest.commands = $$DEPLOYER -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
!contains(DEFINES, WITHOUT_TESTS) {
!android:test.depends = deployTest test.depends = deployTest
unix:!android:test.commands = $$PWD/deployTests/UnitTests.sh -maxwarnings 100000 unix:test.commands = $$PWD/deployTests/UnitTests.sh -maxwarnings 100000
win32:test.commands = $$PWD/deployTests/UnitTests.exe -maxwarnings 100000 -o buildLog.log win32:test.commands = $$PWD/deployTests/UnitTests.exe -maxwarnings 100000 -o buildLog.log
}
contains(QMAKE_HOST.os, Linux):{ contains(QMAKE_HOST.os, Linux):{
win32:test.commands = win32:test.commands =