QuasarApp/CQtDeployer
4
1
Fork 0
mirror of https://github.com/QuasarApp/CQtDeployer.git synced 2025-05-11 00:49:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'v1.3' into v1.4

Browse Source
This commit is contained in:
Andrei Yankovich 2020-02-24 15:45:15 +03:00
commit 5e4f028872
3 changed files with 4 additions and 1 deletions

2
Deploy/configparser.cpp

@ -810,6 +810,8 @@ void ConfigParser::initIgnoreEnvList() {
}
}
ignoreEnvList.push_back(_config.appDir);
_config.envirement.setIgnoreEnvList(ignoreEnvList);
}

1
Deploy/envirement.cpp

@ -56,6 +56,7 @@ void Envirement::addEnv(const QString &dir, const QString &appDir, const QString
auto path = QFileInfo(dir).absoluteFilePath();
for (QString i :_ignoreEnvList) {
i = PathUtils::stripPath(i);
if (path.contains(i, ONLY_WIN_CASE_INSENSIATIVE)) {
return;
}

2
installer

@ -1 +1 @@
Subproject commit 9c2731045d73b6f8ed83cc623d11290d53fb9e52
Subproject commit f6f644ab977f0a2bb24ccb769b12b4ae9b09ee87