fixed windwos bugs

QuasarApp · Oct 17, 2019 · 69d311b · 69d311b
1 parent b763709
commit 69d311b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/Deploy/deploycore.h b/Deploy/deploycore.h
@@ -36,13 +36,15 @@ enum Platform {
     Win32           = 0x1,
     Win64           = 0x2,
     Unix32          = 0x4,
-    Unix64          = 0x8
+    Unix64          = 0x8,
+    GeneralFile     = 0xf
 };
 
 enum LibPriority : int {
     QtLib = 0x0,
     ExtraLib,
     SystemLib,
+    ExtraFile,
     NotFile = 0xF,
 };
 

diff --git a/Deploy/filemanager.cpp b/Deploy/filemanager.cpp
@@ -263,6 +263,7 @@ bool FileManager::copyFolder(const QString &from, const QString &to, const QStri
             LibInfo info;
             info.setName(item.fileName());
             info.setPath(item.absolutePath());
+            info.setPlatform(GeneralFile);
 
             if (config)
                 if (auto rule = config->ignoreList.isIgnore(info)) {

diff --git a/UnitTests/modules.cpp b/UnitTests/modules.cpp
@@ -228,8 +228,6 @@ QSet<QString> Modules::qmlLibs() {
                     "./" + DISTRO_DIR + "/Qt5VirtualKeyboard.dll",
                     "./" + DISTRO_DIR + "/Qt5WebSockets.dll",
                     "./" + DISTRO_DIR + "/Qt5Widgets.dll",
-                    "./" + DISTRO_DIR + "/QtWidgetsProject.exe",
-                    "./" + DISTRO_DIR + "/TestOnlyC.exe",
                     "./" + DISTRO_DIR + "/TestQMLWidgets.exe",
                     "./" + DISTRO_DIR + "/libgcc_s_seh-1.dll",
                     "./" + DISTRO_DIR + "/libstdc++-6.dll",

diff --git a/UnitTests/tst_deploytest.cpp b/UnitTests/tst_deploytest.cpp
@@ -864,7 +864,7 @@ void deploytest::testConfFile() {
                    "-confFile", TestBinDir + "/TestConf.json"}, &comapareTree);
 #else
     runTestParams({"-bin", TestBinDir + "TestOnlyC.exe," + TestBinDir + "QtWidgetsProject.exe," + TestBinDir + "TestQMLWidgets.exe",
-                   "clear" , "-libDir", "L:/never/absalut/path"
+                   "clear" , "-libDir", "L:/never/absalut/path",
                    "-confFile", TestBinDir + "/TestConf.json"}, &comapareTree);
 #endif
 
@@ -879,7 +879,6 @@ void deploytest::testConfFile() {
     QVERIFY(!doc.isNull());
 
 #ifdef Q_OS_UNIX
-    QVERIFY(!doc.isNull());
 
     QVERIFY(data.contains("\"bin\": ["));
     QVERIFY(data.contains("./TestOnlyC"));
@@ -897,13 +896,12 @@ void deploytest::testConfFile() {
 
     runTestParams({"-confFile", TestBinDir + "/TestConf.json"}, &comapareTree);
 #else
-    QVERIFY(!doc.isNull());
 
     QVERIFY(data.contains("\"bin\": ["));
     QVERIFY(data.contains("./TestOnlyC.exe"));
     QVERIFY(data.contains("./QtWidgetsProject.exe"));
     QVERIFY(data.contains("./TestQMLWidgets.exe"));
-    QVERIFY(data.contains("\"libDir\": \"L:/never/absalut/path/\""));
+    QVERIFY(data.contains("\"libDir\": \"L:/never/absalut/path\""));
 
     QVERIFY(data.contains("\"clear\": true"));
 
@@ -917,7 +915,7 @@ void deploytest::testConfFile() {
 #ifdef Q_OS_UNIX
     QVERIFY(QuasarAppUtils::Params::getStrArg("libDir") == "/never/absalut/path/");
 #else
-    QVERIFY(QuasarAppUtils::Params::getStrArg("libDir") == "L:/never/absalut/path/");
+    QVERIFY(QuasarAppUtils::Params::getStrArg("libDir") == "L:/never/absalut/path");
 #endif
     QFile::remove(TestBinDir + "/TestConf.json");
 
@@ -1110,8 +1108,16 @@ void deploytest::testIgnore() {
     auto removeTree = utils.createTree({
                     "./" + DISTRO_DIR + "/Qt5VirtualKeyboard.dll",
                 });
+
     auto removeTreePlugins = utils.createTree({
-                    "./" + DISTRO_DIR + "/Qt5VirtualKeyboard.dll",
+                  "./" + DISTRO_DIR + "/plugins/virtualkeyboard/qtvirtualkeyboard_hangul.dll",
+                  "./" + DISTRO_DIR + "/plugins/virtualkeyboard/qtvirtualkeyboard_openwnn.dll",
+                  "./" + DISTRO_DIR + "/plugins/virtualkeyboard/qtvirtualkeyboard_pinyin.dll",
+                  "./" + DISTRO_DIR + "/plugins/virtualkeyboard/qtvirtualkeyboard_tcime.dll",
+                  "./" + DISTRO_DIR + "/plugins/virtualkeyboard/qtvirtualkeyboard_thai.dll",
+                  "./" + DISTRO_DIR + "/plugins/platforminputcontexts/qtvirtualkeyboardplugin.dll",
+                  "./" + DISTRO_DIR + "/Qt5VirtualKeyboard.dll",
+
                 });
 
 #endif