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

fix after merge

Browse Source
This commit is contained in:
Andrei Yankovich 2018-09-29 16:23:30 +03:00
parent b574c1c002
commit 228054f51a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CQtDeployer/deploy.cpp
View File

@ -298,7 +298,7 @@ void Deploy::extract(const QString &file, bool isExtractPlugins) {
continue;
}
if ((QuasarAppUtils::isEndable("deploy-not-qt") ||
if ((QuasarAppUtils::Params::isEndable("deploy-not-qt") ||
onlyCLibs) &&
!noQTLibs.contains(line)) {
noQTLibs << line;

14
CQtDeployer/main.cpp
View File

@ -45,14 +45,14 @@ void help() {
}
void verboseLog(const QString& str) {
if (QuasarAppUtils::isEndable("verbose")) {
if (QuasarAppUtils::Params::isEndable("verbose")) {
qDebug() << str;
}
}
bool parseQt(Deploy& deploy) {
auto bin = QuasarAppUtils::getStrArg("bin");
auto bin = QuasarAppUtils::Params::getStrArg("bin");
QFileInfo info(bin);
if (!info.isFile()) {
@ -73,8 +73,8 @@ bool parseQt(Deploy& deploy) {
deploy.clear();
}
auto listLibDir = QuasarAppUtils::getStrArg("libDir").split(",");
auto listExtraPlugin = QuasarAppUtils::getStrArg("extraPlugin").split(",");
auto listLibDir = QuasarAppUtils::Params::getStrArg("libDir").split(",");
auto listExtraPlugin = QuasarAppUtils::Params::getStrArg("extraPlugin").split(",");
deploy.setExtraPath(listLibDir);
deploy.setExtraPlugins(listExtraPlugin);
@ -83,7 +83,7 @@ bool parseQt(Deploy& deploy) {
return false;
}
auto qmake = QuasarAppUtils::getStrArg("qmake");
auto qmake = QuasarAppUtils::Params::getStrArg("qmake");
QString basePath = "";
info.setFile(qmake);
if (!info.isFile() || (info.baseName() != "qmake")) {
@ -96,7 +96,7 @@ bool parseQt(Deploy& deploy) {
deploy.setQmake(qmake);
auto scaner = basePath + QDir::separator() + "qmlimportscanner";
auto qmlDir = QuasarAppUtils::getStrArg("qmlDir");
auto qmlDir = QuasarAppUtils::Params::getStrArg("qmlDir");
QDir dir(basePath);
@ -105,7 +105,7 @@ bool parseQt(Deploy& deploy) {
deploy.setDeployQml(true);
deploy.setQmlScaner(scaner);
} else if (QuasarAppUtils::isEndable("allQmlDependes")) {
} else if (QuasarAppUtils::Params::isEndable("allQmlDependes")) {
deploy.setDeployQml(true);
} else {
qCritical () << "wrong qml dir!";