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

fix build

Browse Source
This commit is contained in:
Andrei Yankovich 2020-01-18 16:52:00 +03:00
parent ff386a7e24
commit 1661d57522
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
UnitTests/tst_deploytest.cpp
View File

@ -595,31 +595,31 @@ void deploytest::testQIF() {
"qif", "verbose"}, &comapareTree); "qif", "verbose"}, &comapareTree);
#ifdef Q_OS_UNIX //#ifdef Q_OS_UNIX
QString target2 = TestBinDir + "TestQMLWidgets"; // QString target2 = TestBinDir + "TestQMLWidgets";
QString target3 = TestBinDir + "QtWidgetsProject"; // QString target3 = TestBinDir + "QtWidgetsProject";
#else //#else
QString target2 = TestBinDir + "TestQMLWidgets.exe"; // QString target2 = TestBinDir + "TestQMLWidgets.exe";
QString target3 = TestBinDir + "QtWidgetsProject.exe"; // QString target3 = TestBinDir + "QtWidgetsProject.exe";
#endif //#endif
bin = target1; // bin = target1;
bin += "," + target2; // bin += "," + target2;
bin += "," + target3; // bin += "," + target3;
auto prefixString = "/prefix1/;" + QFileInfo(target1).absoluteFilePath() + ",/prefix2/;" + QFileInfo(target2).absoluteFilePath(); // auto prefixString = "/prefix1/;" + QFileInfo(target1).absoluteFilePath() + ",/prefix2/;" + QFileInfo(target2).absoluteFilePath();
comapareTree = Modules::separetedPrefixeslibs(); // comapareTree = Modules::separetedPrefixeslibs();
runTestParams({"-bin", bin, "force-clear", // runTestParams({"-bin", bin, "force-clear",
"-binOut", "/lol", // "-binOut", "/lol",
"-libOut", "/lolLib", // "-libOut", "/lolLib",
"-trOut", "/lolTr", // "-trOut", "/lolTr",
"-pluginOut", "/p", // "-pluginOut", "/p",
"-qmlOut", "/q", // "-qmlOut", "/q",
"-qmlDir", "prefix2;" + TestBinDir + "/../TestQMLWidgets", // "-qmlDir", "prefix2;" + TestBinDir + "/../TestQMLWidgets",
"-targetPrefix", prefixString, "qif"}, &comapareTree); // "-targetPrefix", prefixString, "qif"}, &comapareTree);
} }
@ -1334,7 +1334,7 @@ void deploytest::testConfFile() {
QString target1 = TestBinDir + "TestOnlyC.exe"; QString target1 = TestBinDir + "TestOnlyC.exe";
#endif #endif
QString bin = target1; bin = target1;
runTestParams({"-bin", bin, "force-clear", runTestParams({"-bin", bin, "force-clear",
"-targetPrefix", "prefix;Test", "-targetPrefix", "prefix;Test",