From 821c7fa0b6276c3d710db03332c5d0be554cb40b Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 16 Apr 2021 20:52:41 +0300 Subject: [PATCH] deploy_tool/main.cpp --- utils/deploy_tool/main.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/utils/deploy_tool/main.cpp b/utils/deploy_tool/main.cpp index f20ad19a..8ac99002 100644 --- a/utils/deploy_tool/main.cpp +++ b/utils/deploy_tool/main.cpp @@ -183,7 +183,7 @@ PIString execute(const PIString & cmd) { void checkQtLib(PIString lib) { - PIString base = lib, pref, suff; + PIString base = lib.toLowerCase(), pref, suff; if (base.startsWith("lib")) {pref += "lib"; base.cutLeft(3);} if (base.startsWith("qt5")) {pref += "Qt5"; base.cutLeft(3);} if (base.startsWith("qt" )) {pref += "Qt" ; base.cutLeft(2);} @@ -265,7 +265,7 @@ void procLdd(PIString file, bool ext_lib = false, int cur_depth = 0) { if (!fname.isEmpty()) { frameworks << fname; framework_libs << l.cutLeft(1).cutRight(1); - checkQtLib(fname.toLowerCase()); + checkQtLib(fname); continue; } } @@ -306,7 +306,7 @@ void procLdd(PIString file, bool ext_lib = false, int cur_depth = 0) { if (ignore_libs.contains(lname)) { continue; } - checkQtLib(fi.name().toLowerCase()); + checkQtLib(fi.name()); cur_libs << l; all_libs << l; } @@ -357,7 +357,7 @@ void procQt() { PIStringList suffixes({".", "..", "qt5", "../qt5"}); piForeachC (PIString s, suffixes) { PIString qd = qloc + "/" + s + "/plugins/"; - PICout(AddSpaces) << "Qt plugins root try" << qd << "..."; + if (piDebug) PICout(AddSpaces) << "Qt plugins root try" << qd << "..."; if (PIDir::isExists(qd + "platforms")) { qdir = qd; piCout << " yes"; @@ -647,7 +647,7 @@ int main(int argc, char * argv[]) { PIString l = findLib(qt_pref + f + qt_suff); if (l.isEmpty()) return; procLdd(l, true); - checkQtLib(f.toLowerCase()); + checkQtLib(f); }); } piForeach (PIString & s, add_libs) {