From 3a7e407627e6921fcd5967d7983c0d516c3a493d Mon Sep 17 00:00:00 2001 From: "a.yankovich" Date: Tue, 17 Nov 2020 13:28:03 +0300 Subject: [PATCH] fix the isNeededQt method --- Deploy/configparser.cpp | 5 +++-- Deploy/qtdir.cpp | 14 +++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Deploy/configparser.cpp b/Deploy/configparser.cpp index 439cb28..9b37a08 100644 --- a/Deploy/configparser.cpp +++ b/Deploy/configparser.cpp @@ -619,13 +619,14 @@ QSet ConfigParser::getQtPathesFromTargets() { QtMajorVersion ConfigParser::isNeededQt() const { + auto Qt = QtMajorVersion::NoQt; for (const auto &i: _config.targets()) { if (i.isValid()) { - return i.isDependetOfQt(); + Qt = Qt | i.isDependetOfQt(); } } - return QtMajorVersion::NoQt; + return Qt; } void ConfigParser::setTargetDir(const QString &target) { diff --git a/Deploy/qtdir.cpp b/Deploy/qtdir.cpp index 6a8e338..007e3aa 100644 --- a/Deploy/qtdir.cpp +++ b/Deploy/qtdir.cpp @@ -79,11 +79,11 @@ bool QtDir::isQt(QString path) const { path = PathUtils::fixPath(path); return - (!libs.isEmpty() && path.contains(libs)) || - (!bins.isEmpty() && path.contains(bins)) || - (!libexecs.isEmpty() && path.contains(libexecs)) || - (!plugins.isEmpty() && path.contains(plugins)) || - (!qmls.isEmpty() && path.contains(qmls)) || - (!translations.isEmpty() && path.contains(translations)) || - (!resources.isEmpty() && path.contains(resources)); + (!libs.isEmpty() && path.contains(libs, ONLY_WIN_CASE_INSENSIATIVE)) || + (!bins.isEmpty() && path.contains(bins, ONLY_WIN_CASE_INSENSIATIVE)) || + (!libexecs.isEmpty() && path.contains(libexecs, ONLY_WIN_CASE_INSENSIATIVE)) || + (!plugins.isEmpty() && path.contains(plugins, ONLY_WIN_CASE_INSENSIATIVE)) || + (!qmls.isEmpty() && path.contains(qmls, ONLY_WIN_CASE_INSENSIATIVE)) || + (!translations.isEmpty() && path.contains(translations, ONLY_WIN_CASE_INSENSIATIVE)) || + (!resources.isEmpty() && path.contains(resources, ONLY_WIN_CASE_INSENSIATIVE)); }