diff --git a/CQtDeployer.pro b/CQtDeployer.pro index b048431..c50096f 100644 --- a/CQtDeployer.pro +++ b/CQtDeployer.pro @@ -17,11 +17,7 @@ CONFIG += ordered tests/TestQtWidgets \ tests/TestQMLWidgets - - contains(DEFINES, WITH_ALL_TESTS) { - SUBDIRS += tests/quicknanobrowser - } - + unix:SUBDIRS += tests/quicknanobrowser contains(DEFINES, WITHOUT_TESTS) { SUBDIRS -= UnitTests \ diff --git a/UnitTests/modulesqt514.cpp b/UnitTests/modulesqt514.cpp index 216e6c3..2dbbaa7 100644 --- a/UnitTests/modulesqt514.cpp +++ b/UnitTests/modulesqt514.cpp @@ -149,7 +149,8 @@ QSet ModulesQt514::qtWebEngine() "./" + DISTRO_DIR + "/qml/QtQml/WorkerScript.2/libworkerscriptplugin.so", "./" + DISTRO_DIR + "/qml/QtQml/WorkerScript.2/plugins.qmltypes", "./" + DISTRO_DIR + "/qml/QtQml/WorkerScript.2/qmldir", - "./" + DISTRO_DIR + "/qml/QtQml/libqmlplugin.so" + "./" + DISTRO_DIR + "/qml/QtQml/libqmlplugin.so", + "./" + DISTRO_DIR + "/translations/qtwebengine_ca.qm" }); #endif return res; diff --git a/UnitTests/tst_deploytest.cpp b/UnitTests/tst_deploytest.cpp index 5bd6141..33e3eee 100644 --- a/UnitTests/tst_deploytest.cpp +++ b/UnitTests/tst_deploytest.cpp @@ -474,8 +474,6 @@ void deploytest::testMSVC() { void deploytest::testEmptyParamsString() { TestUtils utils; -#ifdef WITH_ALL_TESTS - QDir("./" + DISTRO_DIR).removeRecursively(); auto comapareTree = Modules::testEmptyParamsTree(); @@ -496,28 +494,17 @@ void deploytest::testEmptyParamsString() { comapareTree = utils.createTree({}); runTestParams({"clear", "-targetDir", "./testDeployDir"}, &comapareTree); - -#endif } void deploytest::testWebEngine() { -#ifdef WITH_ALL_TESTS +#ifdef Q_OS_UNIX TestUtils utils; - -#ifdef Q_OS_UNIX QString bin = TestBinDir + "quicknanobrowser"; QString qmake = TestQtDir + "bin/qmake"; -#else - QString bin = TestBinDir + "quicknanobrowser.exe"; - QString qmake = TestQtDir + "bin/qmake.exe"; - -#endif - auto comapareTree = Modules::qtWebEngine(); - runTestParams({"-bin", bin, "clear" , "-qmake", qmake, "-qmlDir", TestBinDir + "/../quicknanobrowser"}, &comapareTree); @@ -1141,7 +1128,7 @@ void deploytest::testBinDir() { "./" + DISTRO_DIR + "/qt.conf"}); #endif -#ifdef WITH_ALL_TESTS +#ifdef Q_OS_UNIX comapareTree += utils.createTree( {"./" + DISTRO_DIR + "/bin/quicknanobrowser", "./" + DISTRO_DIR + "/quicknanobrowser.sh"}); @@ -1176,7 +1163,7 @@ void deploytest::testConfFile() { "./" + DISTRO_DIR + "/TestQMLWidgets.exe"}); #endif -#ifdef WITH_ALL_TESTS +#ifdef Q_OS_UNIX comapareTree += utils.createTree( {"./" + DISTRO_DIR + "/bin/quicknanobrowser", "./" + DISTRO_DIR + "/quicknanobrowser.sh"});