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 bugs

Browse Source
This commit is contained in:
a.yankovich 2018-09-19 18:22:48 +03:00
parent 0d1ebda0a2
commit d71cb805eb
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CQtDeployer/deploy.cpp
View File

@ -297,7 +297,8 @@ void Deploy::extract(const QString &file, bool isExtractPlugins) {
continue;
}
if (QuasarAppUtils::isEndable("deploy-not-qt") &&
if ((QuasarAppUtils::isEndable("deploy-not-qt") ||
onlyCLibs) &&
!noQTLibs.contains(line)) {
noQTLibs << line;
extract(line, isExtractPlugins);
@ -401,7 +402,6 @@ void Deploy::copyPlugins(const QStringList &list) {
copyFile(info.absoluteFilePath(), targetDir + QDir::separator() + "plugins");
extract(info.absoluteFilePath());
}
}
}

15
CQtDeployer/main.cpp
View File

@ -57,9 +57,15 @@ bool parseQt(Deploy& deploy) {
return false;
}
auto list = QuasarAppUtils::getStrArg("libDir").split(",");
if (QuasarAppUtils::isEndable("clear")) {
qInfo() << "clear old data";
deploy.clear();
}
deploy.setExtraPath(list);
auto listLibDir = QuasarAppUtils::getStrArg("libDir").split(",");
auto listExtraPlugin = QuasarAppUtils::getStrArg("extraPlugin").split(",");
deploy.setExtraPath(listLibDir);
deploy.setExtraPlugins(listExtraPlugin);
if (!deploy.initDirs()) {
qCritical() << "error init targeet dir";
@ -79,11 +85,6 @@ bool parseQt(Deploy& deploy) {
deploy.setQmake(qmake);
auto scaner = basePath + QDir::separator() + "qmlimportscanner";
if (QuasarAppUtils::isEndable("clear")) {
qInfo() << "clear old data";
deploy.clear();
}
auto qmlDir = QuasarAppUtils::getStrArg("qmlDir");
QDir dir(basePath);