From 63ac3161dd04a287ab5afc977ca4ad0613e1c53a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?=
 =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= <peri4ko@yandex.ru>
Date: Thu, 26 Mar 2020 14:28:08 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@991
 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

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

diff --git a/utils/deploy_tool/main.cpp b/utils/deploy_tool/main.cpp
index 878eb3fc..38263b62 100644
--- a/utils/deploy_tool/main.cpp
+++ b/utils/deploy_tool/main.cpp
@@ -36,8 +36,8 @@ void usage() {
 	piCout << "If some Qt dependency found, copy corresponding Qt plugins.";
 	piCout << "Styles and platforms selected by -S and -P flags,";
 	piCout << "any other plugins described by --qt-plugins flag in next format:";
-	piCout << "\"[*=;]<plugins>=<regexp>,<regexp>;<plugins>=<regexp>,<regexp>\", e.g.";
-	piCout << "\"sqldrivers=lite,mysql;geoservices=;position=nmea\".";
+	piCout << "\"[*=:]<plugins>=<regexp>,<regexp>:<plugins>=<regexp>,<regexp>\", e.g.";
+	piCout << "\"sqldrivers=lite,mysql:geoservices=:position=nmea\".";
 	piCout << "If no regexp specified for plugins, nothing will be copied.";
 	piCout << "Default regexp set by \"*=<regexp>\".";
 	piCout << "\"*=\" disable optional plugins.";
@@ -312,6 +312,7 @@ void procQt() {
 				if (plugin == "styles") filters = styles;
 				if (plugin == "sqldrivers") filters = sqldrivers;*/
 				piForeachC (PIString & f, filters) {
+					if (f.isEmpty()) continue;
 					copyWildcard(qdir + plugin + "/" + f, out_plugins_dir + plugin);
 					PIVector<PIFile::FileInfo> copied = PIDir(out_plugins_dir + plugin).entries();
 					piForeachC (PIFile::FileInfo & fi, copied) {
@@ -416,7 +417,7 @@ int main(int argc, char * argv[]) {
 	platforms = qplatforms.split(",");
 	styles = cli.argumentValue("Styles").split(",");
 	if (styles.isEmpty()) styles << "";
-	PIStringList qpd = cli.argumentValue("qt-plugins").toLowerCase().split(";");
+	PIStringList qpd = cli.argumentValue("qt-plugins").toLowerCase().split(":");
 	piForeachC (PIString & qp, qpd) {
 		int _i = qp.indexOf("=");
 		if (_i < 0) continue;