Always use qtToBeBundledInfo.value("QT_INSTALL_QML ")

This commit is contained in:
probonopd
2017-03-12 18:38:17 +01:00
committed by GitHub
parent 1d265dc78a
commit fc571daf7b
+5 -10
View File
@@ -1074,20 +1074,15 @@ bool deployQmlImports(const QString &appDirPath, DeploymentInfo deploymentInfo,
argumentList.append("-rootPath"); argumentList.append("-rootPath");
argumentList.append(qmlDir); argumentList.append(qmlDir);
} }
QString qmlImportsPath = qtToBeBundledInfo.value("QT_INSTALL_QML");
LogDebug() << "qmlImportsPath candidate:" << qmlImportsPath;
// Verify that we found a valid qmlImportsPath
if (!QFile(qmlImportsPath + "/QtQml").exists()) {
LogError() << "Valid qmlImportsPath not found at" << qmlImportsPath;
LogError() << "Possibly your Qt library has the wrong information in qt_prfxpath, e.g., because it was moved since it was compiled";
return false;
}
LogDebug() << "qmlImportsPath:" << qmlImportsPath;
argumentList.append( "-importPath"); argumentList.append( "-importPath");
argumentList.append(qmlImportsPath); argumentList.append(qmlImportsPath);
argumentList.append( "-importPath");
argumentList.append(qtToBeBundledInfo.value("QT_INSTALL_QML "));
LogDebug() << "qmlImportsPath:" << qmlImportsPath;
// run qmlimportscanner // run qmlimportscanner
QProcess qmlImportScanner; QProcess qmlImportScanner;
LogDebug() << qmlImportScannerPath << argumentList; LogDebug() << qmlImportScannerPath << argumentList;