deploy_tool Qt plugins dir search patch
This commit is contained in:
@@ -352,8 +352,21 @@ void procQt() {
|
||||
l.takeWord();
|
||||
PIString qloc = l.trim();
|
||||
piCout << "Qt" << qv << "in" << qloc;
|
||||
PIString qdir = qloc;
|
||||
#ifdef WINDOWS
|
||||
PIString qdir;
|
||||
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())
|
||||
qdir += "/../plugins/";
|
||||
else
|
||||
@@ -363,7 +376,7 @@ void procQt() {
|
||||
qdir += "/qt5/plugins/";
|
||||
else
|
||||
qdir += "/plugins/";
|
||||
#endif
|
||||
#endif*/
|
||||
piForeachC (PIString & plugin, pdirs) {
|
||||
PIStringList filters = qt_filters[plugin];
|
||||
piForeachC (PIString & f, filters) {
|
||||
|
||||
Reference in New Issue
Block a user