SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

deploy_tool/main.cpp

Browse Source
This commit is contained in:
Пелипенко Иван
2021-04-16 20:52:41 +03:00
parent b7067aae46
commit 821c7fa0b6
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
utils/deploy_tool/main.cpp
View File

@@ -183,7 +183,7 @@ PIString execute(const PIString & cmd) {
void checkQtLib(PIString lib) { 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("lib")) {pref += "lib"; base.cutLeft(3);}
if (base.startsWith("qt5")) {pref += "Qt5"; base.cutLeft(3);} if (base.startsWith("qt5")) {pref += "Qt5"; base.cutLeft(3);}
if (base.startsWith("qt" )) {pref += "Qt" ; base.cutLeft(2);} 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()) { if (!fname.isEmpty()) {
frameworks << fname; frameworks << fname;
framework_libs << l.cutLeft(1).cutRight(1); framework_libs << l.cutLeft(1).cutRight(1);
checkQtLib(fname.toLowerCase()); checkQtLib(fname);
continue; continue;
} }
} }
@@ -306,7 +306,7 @@ void procLdd(PIString file, bool ext_lib = false, int cur_depth = 0) {
if (ignore_libs.contains(lname)) { if (ignore_libs.contains(lname)) {
continue; continue;
} }
checkQtLib(fi.name().toLowerCase()); checkQtLib(fi.name());
cur_libs << l; cur_libs << l;
all_libs << l; all_libs << l;
} }
@@ -357,7 +357,7 @@ void procQt() {
PIStringList suffixes({".", "..", "qt5", "../qt5"}); PIStringList suffixes({".", "..", "qt5", "../qt5"});
piForeachC (PIString s, suffixes) { piForeachC (PIString s, suffixes) {
PIString qd = qloc + "/" + s + "/plugins/"; 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")) { if (PIDir::isExists(qd + "platforms")) {
qdir = qd; qdir = qd;
piCout << " yes"; piCout << " yes";
@@ -647,7 +647,7 @@ int main(int argc, char * argv[]) {
PIString l = findLib(qt_pref + f + qt_suff); PIString l = findLib(qt_pref + f + qt_suff);
if (l.isEmpty()) return; if (l.isEmpty()) return;
procLdd(l, true); procLdd(l, true);
checkQtLib(f.toLowerCase()); checkQtLib(f);
}); });
} }
piForeach (PIString & s, add_libs) { piForeach (PIString & s, add_libs) {