From a4629649cedea934fa0beeb4dba96692bd8c83a1 Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Thu, 9 Jul 2020 00:27:30 +0300
Subject: [PATCH] fix disablePlugins option

---
 Deploy/extracter.cpp         |  2 +-
 UnitTests/tst_deploytest.cpp | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/Deploy/extracter.cpp b/Deploy/extracter.cpp
index 1e043ee..2160236 100644
--- a/Deploy/extracter.cpp
+++ b/Deploy/extracter.cpp
@@ -237,7 +237,7 @@ void Extracter::deploy() {
     }
 
     if (!deployMSVC()) {
-        QuasarAppUtils::Params::log("deploy msvc failed");
+        QuasarAppUtils::Params::log("deploy msvc failed", QuasarAppUtils::Warning);
     }
 
     _metaFileManager->createRunMetaFiles();
diff --git a/UnitTests/tst_deploytest.cpp b/UnitTests/tst_deploytest.cpp
index 275d318..e0f7d52 100644
--- a/UnitTests/tst_deploytest.cpp
+++ b/UnitTests/tst_deploytest.cpp
@@ -1827,7 +1827,6 @@ void deploytest::testExtraPlugins() {
 
     auto pluginTree = utils.createTree(
     {
-                    "./" + DISTRO_DIR + "/bin/qt.conf",
                     "./" + DISTRO_DIR + "/plugins/sqldrivers/libqsqlodbc.so",
                     "./" + DISTRO_DIR + "/plugins/sqldrivers/libqsqlpsql.so",
                     "./" + DISTRO_DIR + "/plugins/sqldrivers/libqsqlite.so",
@@ -1841,7 +1840,6 @@ void deploytest::testExtraPlugins() {
 
     auto pluginTree = utils.createTree(
     {
-                    "./" + DISTRO_DIR + "/qt.conf",
                     "./" + DISTRO_DIR + "/plugins/sqldrivers/qsqlmysql.dll",
                     "./" + DISTRO_DIR + "/plugins/sqldrivers/qsqlodbc.dll",
                     "./" + DISTRO_DIR + "/plugins/sqldrivers/qsqlite.dll",
@@ -1868,6 +1866,20 @@ void deploytest::testExtraPlugins() {
     runTestParams({"-bin", bin, "clear" ,
                    "-qmake", qmake,
                    "-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() {