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

fix deploy qml (shared build)

Browse Source
This commit is contained in:
Andrei Yankovich 2019-01-21 22:45:04 +03:00
parent a1b7509462
commit adfa139c32
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CQtDeployer/deploy.cpp
View File

@ -767,6 +767,16 @@ bool Deploy::isLib(const QFileInfo &file) {
QStringList Deploy::extractImportsFromDir(const QString &filepath) {
QProcess p;
QProcessEnvironment env;
env.insert("LD_LIBRARY_PATH", concatEnv());
env.insert("QML_IMPORT_PATH", DeployUtils::qtDir + "/qml");
env.insert("QML2_IMPORT_PATH", DeployUtils::qtDir + "/qml");
env.insert("QT_PLUGIN_PATH", DeployUtils::qtDir + "/plugins");
env.insert("QT_QPA_PLATFORM_PLUGIN_PATH", DeployUtils::qtDir + "/plugins/platforms");
p.setProcessEnvironment(env);
p.setProgram(qmlScaner);
p.setArguments(QStringList()
<< "-rootPath" << filepath << "-importPath" << qmlDir);
@ -777,7 +787,15 @@ QStringList Deploy::extractImportsFromDir(const QString &filepath) {
return QStringList();
}
auto data = QJsonDocument::fromJson(p.readAll());
auto rawData = p.readAll();
if (p.exitCode()) {
qWarning() << "scaner error " << p.errorString() << "exitCode: " << p.exitCode();
}
QuasarAppUtils::Params::verboseLog("rawData from extractImportsFromDir: " + rawData);
auto data = QJsonDocument::fromJson(rawData);
if (!data.isArray()) {
qWarning() << "wrong data from qml scaner! of " << filepath;