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

fix disablePlugins option

Browse Source
This commit is contained in:
Andrei Yankovich 2020-07-09 00:27:30 +03:00
parent 988d9f8fca
commit a4629649ce
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Deploy/extracter.cpp
View File

@ -237,7 +237,7 @@ void Extracter::deploy() {
} }
if (!deployMSVC()) { if (!deployMSVC()) {
QuasarAppUtils::Params::log("deploy msvc failed"); QuasarAppUtils::Params::log("deploy msvc failed", QuasarAppUtils::Warning);
} }
_metaFileManager->createRunMetaFiles(); _metaFileManager->createRunMetaFiles();

16
UnitTests/tst_deploytest.cpp
View File

@ -1827,7 +1827,6 @@ void deploytest::testExtraPlugins() {
auto pluginTree = utils.createTree( auto pluginTree = utils.createTree(
{ {
"./" + DISTRO_DIR + "/bin/qt.conf",
"./" + DISTRO_DIR + "/plugins/sqldrivers/libqsqlodbc.so", "./" + DISTRO_DIR + "/plugins/sqldrivers/libqsqlodbc.so",
"./" + DISTRO_DIR + "/plugins/sqldrivers/libqsqlpsql.so", "./" + DISTRO_DIR + "/plugins/sqldrivers/libqsqlpsql.so",
"./" + DISTRO_DIR + "/plugins/sqldrivers/libqsqlite.so", "./" + DISTRO_DIR + "/plugins/sqldrivers/libqsqlite.so",
@ -1841,7 +1840,6 @@ void deploytest::testExtraPlugins() {
auto pluginTree = utils.createTree( auto pluginTree = utils.createTree(
{ {
"./" + DISTRO_DIR + "/qt.conf",
"./" + DISTRO_DIR + "/plugins/sqldrivers/qsqlmysql.dll", "./" + DISTRO_DIR + "/plugins/sqldrivers/qsqlmysql.dll",
"./" + DISTRO_DIR + "/plugins/sqldrivers/qsqlodbc.dll", "./" + DISTRO_DIR + "/plugins/sqldrivers/qsqlodbc.dll",
"./" + DISTRO_DIR + "/plugins/sqldrivers/qsqlite.dll", "./" + DISTRO_DIR + "/plugins/sqldrivers/qsqlite.dll",
@ -1868,6 +1866,20 @@ void deploytest::testExtraPlugins() {
runTestParams({"-bin", bin, "clear" , runTestParams({"-bin", bin, "clear" ,
"-qmake", qmake, "-qmake", qmake,
"-extraPlugin", TestQtDir + "/plugins/sqldrivers"}, &comapareTree); "-extraPlugin", TestQtDir + "/plugins/sqldrivers"}, &comapareTree);
comapareTree -= pluginTree;
comapareTree -= utils.createTree(
{
"./" + DISTRO_DIR + "/plugins/platforms/libqxcb.so",
"./" + DISTRO_DIR + "/plugins/xcbglintegrations/libqxcb-egl-integration.so",
"./" + DISTRO_DIR + "/plugins/xcbglintegrations/libqxcb-glx-integration.so",
"./" + DISTRO_DIR + "/lib/libQt5XcbQpa.so",
});
runTestParams({"-bin", bin, "clear" ,
"-qmake", qmake,
"-disablePlugins", "qxcb,xcbglintegrations"}, &comapareTree);
} }
void deploytest::testTargetDir() { void deploytest::testTargetDir() {