QuasarApp/CQtDeployer
4
1
Fork 0
mirror of https://github.com/QuasarApp/CQtDeployer.git synced 2025-05-04 13:39:34 +00:00
Code Issues Projects Releases Wiki Activity

move to use core20 code base

Browse Source
This commit is contained in:
Andrei Yankovich 2020-10-16 14:02:53 +03:00
parent 896fb4617e
commit b2f03b2ae3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Deploy/configparser.cpp
View File

@ -897,7 +897,7 @@ bool ConfigParser::initQmakePrivate(const QString &qmake) {
QuasarAppUtils::Warning); QuasarAppUtils::Warning);
if (!setQtDir(dir.absolutePath())){ if (!setQtDir(dir.absolutePath())){
QuasarAppUtils::Params::log("fail ini qmake", QuasarAppUtils::Params::log("fail init qmake",
QuasarAppUtils::Error); QuasarAppUtils::Error);
return false; return false;
} }
@ -930,7 +930,7 @@ bool ConfigParser::initQmake() {
if (!QuasarAppUtils::Params::isEndable("noCheckPATH")) { if (!QuasarAppUtils::Params::isEndable("noCheckPATH")) {
auto env = QProcessEnvironment::systemEnvironment(); auto env = QProcessEnvironment::systemEnvironment();
auto proc = DeployCore::findProcess(env.value("PATH"), "qmake"); auto proc = DeployCore::findProcess(env.value("PATH"), "qexit make");
if (proc.isEmpty()) { if (proc.isEmpty()) {
QuasarAppUtils::Params::log("The deployment target requir Qt libs, but init qmake is failed." QuasarAppUtils::Params::log("The deployment target requir Qt libs, but init qmake is failed."
"Use the qmake option for set a path to qmake.", "Use the qmake option for set a path to qmake.",

2
snap/snapcraft.yaml
View File

@ -16,7 +16,7 @@ description: |
grade: stable # must be 'stable' to release into candidate/stable channels grade: stable # must be 'stable' to release into candidate/stable channels
confinement: strict # use 'strict' once you have the right plugs and slots confinement: strict # use 'strict' once you have the right plugs and slots
base: core18 base: core20
icon: snap/gui/icon.png icon: snap/gui/icon.png
apps: apps:
cqtdeployer: cqtdeployer: