From a07e3c506b54436ac33ed7a453c95ba2c4d5ddd2 Mon Sep 17 00:00:00 2001
From: peri4 <peri4ko@yandex.ru>
Date: Thu, 15 Apr 2021 11:32:52 +0300
Subject: [PATCH] deploy_tool Qt plugins dir search patch

---
 utils/deploy_tool/main.cpp | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/utils/deploy_tool/main.cpp b/utils/deploy_tool/main.cpp
index 056402ab..ce41019c 100644
--- a/utils/deploy_tool/main.cpp
+++ b/utils/deploy_tool/main.cpp
@@ -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) {