QuasarApp/CQtDeployer
4
1
Fork 0
mirror of https://github.com/QuasarApp/CQtDeployer.git synced 2025-04-27 10:14:32 +00:00
Code Issues Projects Releases Wiki Activity

fix the isNeededQt method

Browse Source
This commit is contained in:
Andrei Yankovich 2020-11-17 13:28:03 +03:00
parent e846c6f916
commit 3a7e407627
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Deploy/configparser.cpp
View File

@ -619,13 +619,14 @@ QSet<QString> ConfigParser::getQtPathesFromTargets() {
QtMajorVersion ConfigParser::isNeededQt() const { QtMajorVersion ConfigParser::isNeededQt() const {
auto Qt = QtMajorVersion::NoQt;
for (const auto &i: _config.targets()) { for (const auto &i: _config.targets()) {
if (i.isValid()) { if (i.isValid()) {
return i.isDependetOfQt(); Qt = Qt | i.isDependetOfQt();
} }
} }
return QtMajorVersion::NoQt; return Qt;
} }
void ConfigParser::setTargetDir(const QString &target) { void ConfigParser::setTargetDir(const QString &target) {

14
Deploy/qtdir.cpp
View File

@ -79,11 +79,11 @@ bool QtDir::isQt(QString path) const {
path = PathUtils::fixPath(path); path = PathUtils::fixPath(path);
return return
(!libs.isEmpty() && path.contains(libs)) || (!libs.isEmpty() && path.contains(libs, ONLY_WIN_CASE_INSENSIATIVE)) ||
(!bins.isEmpty() && path.contains(bins)) || (!bins.isEmpty() && path.contains(bins, ONLY_WIN_CASE_INSENSIATIVE)) ||
(!libexecs.isEmpty() && path.contains(libexecs)) || (!libexecs.isEmpty() && path.contains(libexecs, ONLY_WIN_CASE_INSENSIATIVE)) ||
(!plugins.isEmpty() && path.contains(plugins)) || (!plugins.isEmpty() && path.contains(plugins, ONLY_WIN_CASE_INSENSIATIVE)) ||
(!qmls.isEmpty() && path.contains(qmls)) || (!qmls.isEmpty() && path.contains(qmls, ONLY_WIN_CASE_INSENSIATIVE)) ||
(!translations.isEmpty() && path.contains(translations)) || (!translations.isEmpty() && path.contains(translations, ONLY_WIN_CASE_INSENSIATIVE)) ||
(!resources.isEmpty() && path.contains(resources)); (!resources.isEmpty() && path.contains(resources, ONLY_WIN_CASE_INSENSIATIVE));
} }