TianZD/linuxdeployqt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove or replace all uses of qmlImportsPath by qtToBeBundledInfo

Browse Source 
It seems that the removal of qmlImportsPath was half-done and there were
still some uses of it around.
This commit is contained in:
Àlex Fiestas
2017-03-16 11:56:08 +01:00
parent fc571daf7b
commit ac9e9db2d0
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/shared.cpp
+2 -5
View File
@@ -1075,13 +1075,10 @@ bool deployQmlImports(const QString &appDirPath, DeploymentInfo deploymentInfo,
argumentList.append(qmlDir); argumentList.append(qmlDir);
} }
argumentList.append( "-importPath");
argumentList.append(qmlImportsPath);
argumentList.append( "-importPath"); argumentList.append( "-importPath");
argumentList.append(qtToBeBundledInfo.value("QT_INSTALL_QML ")); argumentList.append(qtToBeBundledInfo.value("QT_INSTALL_QML "));
LogDebug() << "qmlImportsPath:" << qmlImportsPath; LogDebug() << "qmlImportsPath (QT_INSTALL_QML):" << qtToBeBundledInfo.value("QT_INSTALL_QML ");
// run qmlimportscanner // run qmlimportscanner
QProcess qmlImportScanner; QProcess qmlImportScanner;
@@ -1168,7 +1165,7 @@ bool deployQmlImports(const QString &appDirPath, DeploymentInfo deploymentInfo,
if (deploymentInfo.deployedLibraries.contains("QtWidgets") && qtQuickContolsInUse) { if (deploymentInfo.deployedLibraries.contains("QtWidgets") && qtQuickContolsInUse) {
LogNormal() << "Deploying QML import QtQuick/PrivateWidgets"; LogNormal() << "Deploying QML import QtQuick/PrivateWidgets";
QString name = "QtQuick/PrivateWidgets"; QString name = "QtQuick/PrivateWidgets";
QString path = qmlImportsPath + QLatin1Char('/') + name; QString path = qtToBeBundledInfo.value("QT_INSTALL_QML ") + QLatin1Char('/') + name;
deployQmlImport(appDirPath, deploymentInfo.rpathsUsed, path, name); deployQmlImport(appDirPath, deploymentInfo.rpathsUsed, path, name);
LogNormal() << ""; LogNormal() << "";
} }