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

deploy_tool Qt plugins dir search patch

Browse Source
This commit is contained in:
Пелипенко Иван
2021-04-15 11:32:52 +03:00
parent 95002973e8
commit a07e3c506b
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
utils/deploy_tool/main.cpp
View File

@@ -352,8 +352,21 @@ void procQt() {
l.takeWord(); l.takeWord();
PIString qloc = l.trim(); PIString qloc = l.trim();
piCout << "Qt" << qv << "in" << qloc; piCout << "Qt" << qv << "in" << qloc;
PIString qdir = qloc; PIString qdir;
#ifdef WINDOWS PIStringList suffixes({".", "..", "qt5", "../qt5"});
piForeachC (PIString s, suffixes) {
PIString qd = qloc + "/" + s + "/plugins/";
PICout(AddSpaces) << "Qt plugins root try" << qd << "...";
if (PIDir::isExists(qd + "platforms")) {
qdir = qd;
piCout << " yes";
break;
}
piCout << " no";
}
if (qdir.isEmpty())
break;
/*#ifdef WINDOWS
if (qt_dir.isEmpty()) if (qt_dir.isEmpty())
qdir += "/../plugins/"; qdir += "/../plugins/";
else else
@@ -363,7 +376,7 @@ void procQt() {
qdir += "/qt5/plugins/"; qdir += "/qt5/plugins/";
else else
qdir += "/plugins/"; qdir += "/plugins/";
#endif #endif*/
piForeachC (PIString & plugin, pdirs) { piForeachC (PIString & plugin, pdirs) {
PIStringList filters = qt_filters[plugin]; PIStringList filters = qt_filters[plugin];
piForeachC (PIString & f, filters) { piForeachC (PIString & f, filters) {