QuasarApp/CQtDeployer
4
1
Fork 0
mirror of https://github.com/QuasarApp/CQtDeployer.git synced 2025-04-28 18:54:33 +00:00
Code Issues Projects Releases Wiki Activity

ref #740 added more logs and fix the setQtDir method

Browse Source
This commit is contained in:
Andrei Yankovich 2022-12-20 17:28:40 +03:00
parent 671565961d
commit 5b1ab9e035
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Deploy/src/configparser.cpp
View File

@ -1304,8 +1304,13 @@ bool ConfigParser::setQmake(const QString &value) {
}
}
if (_config.qtDir.getLibs().isEmpty())
if (_config.qtDir.getLibs().isEmpty()) {
QuasarAppUtils::Params::log("Wrong output from the qmake process. " + qmakeInfo.absoluteFilePath(), QuasarAppUtils::Warning);
QuasarAppUtils::Params::log("Raw output:" + qmakeData, QuasarAppUtils::Debug);
QuasarAppUtils::Params::log("Parsed Qt configuration: \n" + _config.qtDir.toString(), QuasarAppUtils::Debug);
return false;
}
_config.envirement.addEnv(_config.qtDir.getLibs());
_config.envirement.addEnv(_config.qtDir.getBins());
@ -1320,11 +1325,17 @@ bool ConfigParser::setQtDir(const QString &value) {
QuasarAppUtils::Params::log("initialize qt dirs for. " + info.absoluteFilePath(),
QuasarAppUtils::Debug);
if (!QFile::exists(info.absoluteFilePath() + ("/bin"))) {
QuasarAppUtils::Params::log("get qt bin failed!", QuasarAppUtils::Debug);
return false;
if (DeployCore::isDebianQt(value)) {
if (QFile::exists(info.absoluteFilePath() + ("/bin"))) {
_config.qtDir.setBins(info.absoluteFilePath() + ("/bin"));
}
} else {
if (!QFile::exists(info.absoluteFilePath() + ("/bin"))) {
QuasarAppUtils::Params::log("get qt bin failed!", QuasarAppUtils::Debug);
return false;
}
_config.qtDir.setBins(info.absoluteFilePath() + ("/bin"));
}
_config.qtDir.setBins(info.absoluteFilePath() + ("/bin"));
if (DeployCore::isDebianQt(value)) {
_config.qtDir.setLibs(info.absolutePath());