From 49a5ed6aa3592beeafc580f6b72fd3c956544497 Mon Sep 17 00:00:00 2001 From: peri4 Date: Mon, 20 Nov 2023 23:33:34 +0300 Subject: [PATCH] deploy_tool remove empty --- utils/deploy_tool/main.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/utils/deploy_tool/main.cpp b/utils/deploy_tool/main.cpp index 2dd2b954..563f6d0a 100644 --- a/utils/deploy_tool/main.cpp +++ b/utils/deploy_tool/main.cpp @@ -612,9 +612,9 @@ int main(int argc, char * argv[]) { piDebug = cli.hasArgument("verbose"); is_deps = cli.hasArgument("dependencies"); out_dir = cli.argumentValue("output"); - lib_dirs = cli.argumentValue("search_path").split(DELIM); - add_libs = cli.argumentValue("add_libs").split(DELIM); - ignore_libs = PISet(cli.argumentValue("ignore").split(DELIM)); + lib_dirs = cli.argumentValue("search_path").split(DELIM).removeAll(""); + add_libs = cli.argumentValue("add_libs").split(DELIM).removeAll(""); + ignore_libs = PISet(cli.argumentValue("ignore").split(DELIM).removeAll("")); qt_dir = cli.argumentValue("qtdir"); ldd = cli.argumentValue("ldd"); readelf = cli.argumentValue("Lreadelf"); @@ -668,7 +668,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(DELIM); + PIStringList qpd = cli.argumentValue("qt-plugins").toLowerCase().split(DELIM).removeAll(""); piForeachC(PIString & qp, qpd) { int _i = qp.find('='); if (_i < 0) continue; @@ -687,7 +687,7 @@ int main(int argc, char * argv[]) { qt_filters["platforms"] = platforms; qt_filters["styles"] = styles; - qt_add_libs = cli.argumentValue("qt-modules").split(DELIM); + qt_add_libs = cli.argumentValue("qt-modules").split(DELIM).removeAll(""); auto getQtSubdir = [&cli](const char * arg, PIString & var) { var = cli.argumentValue(arg).trim(); if (var.isEmpty()) @@ -702,7 +702,7 @@ int main(int argc, char * argv[]) { getQtSubdir("qt-plugins-dir", qt_plugins_dir); getQtSubdir("qt-qml-dir", qt_qml_dir); - qml_list = cli.argumentValue("qml-modules").split(DELIM); + qml_list = cli.argumentValue("qml-modules").split(DELIM).removeAll(""); need_qt = !qt_add_libs.isEmpty();