diff --git a/CQtDeployer/deploy.cpp b/CQtDeployer/deploy.cpp index 0ad3e12..6021446 100644 --- a/CQtDeployer/deploy.cpp +++ b/CQtDeployer/deploy.cpp @@ -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()); } - } } diff --git a/CQtDeployer/main.cpp b/CQtDeployer/main.cpp index 716f9bd..8a7c463 100644 --- a/CQtDeployer/main.cpp +++ b/CQtDeployer/main.cpp @@ -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);