From 5dad08c729d0936d5e3176d2ebb29465b49517e6 Mon Sep 17 00:00:00 2001 From: peri4 Date: Thu, 29 Apr 2021 12:25:17 +0300 Subject: [PATCH] deploy_tool windows libraries case patch --- utils/deploy_tool/main.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/utils/deploy_tool/main.cpp b/utils/deploy_tool/main.cpp index 6e75f2e9..43a56f77 100644 --- a/utils/deploy_tool/main.cpp +++ b/utils/deploy_tool/main.cpp @@ -130,7 +130,7 @@ QtDep qt_deps[] = { int depth = 8; -bool fake = false, is_ldd = true, is_deps = false, need_qt = false, make_qt_format = true, rpath = false; +bool fake = false, is_ldd = true, is_deps = false, need_qt = false, make_qt_format = true, rpath = false, win_target = false; PIString ldd, readelf, objdump, otool, dpkg, nametool, strip, out_dir, qt_dir, dpkg_workdir; PIString qt_pref, qt_suff, qt_conf_dir, qt_plugins_dir, target_dir; PIStringList styles, lib_dirs, add_libs, platforms, sqldrivers, input_files, plugin_libs, qt_add_libs; @@ -141,8 +141,13 @@ PIMap qt_filters; PIString findLib(const PIString & l) { if (PIFile::isExists(l)) return l; piForeachC (PIString & s, lib_dirs) { - if (PIFile::isExists(s + l)) { + if (PIFile::isExists(s + l)) return s + l; + if (win_target) { + if (PIFile::isExists(s + l.toLowerCase())) + return s + l.toLowerCase(); + if (PIFile::isExists(s + l.toUpperCase())) + return s + l.toUpperCase(); } } return ""; @@ -613,6 +618,7 @@ int main(int argc, char * argv[]) { } if (!cli.argumentValue("Platforms").isEmpty()) qplatforms = cli.argumentValue("Platforms"); + if (platforms.contains("windows")) win_target = true; platforms = qplatforms.split(","); styles = cli.argumentValue("Styles").split(","); if (styles.isEmpty()) styles << "";