Browse Source
Remove or replace all uses of qmlImportsPath by qtToBeBundledInfo
It seems that the removal of qmlImportsPath was half-done and there were
still some uses of it around.
master
Àlex Fiestas
8 years ago
No known key found for this signature in database
GPG Key ID: 60AC676CEC24059E
1 changed files with
2 additions and
5 deletions
-
shared/shared.cpp
|
|
@ -1075,13 +1075,10 @@ bool deployQmlImports(const QString &appDirPath, DeploymentInfo deploymentInfo, |
|
|
|
argumentList.append(qmlDir); |
|
|
|
} |
|
|
|
|
|
|
|
argumentList.append( "-importPath"); |
|
|
|
argumentList.append(qmlImportsPath); |
|
|
|
|
|
|
|
argumentList.append( "-importPath"); |
|
|
|
argumentList.append(qtToBeBundledInfo.value("QT_INSTALL_QML ")); |
|
|
|
|
|
|
|
LogDebug() << "qmlImportsPath:" << qmlImportsPath; |
|
|
|
LogDebug() << "qmlImportsPath (QT_INSTALL_QML):" << qtToBeBundledInfo.value("QT_INSTALL_QML "); |
|
|
|
|
|
|
|
// run qmlimportscanner
|
|
|
|
QProcess qmlImportScanner; |
|
|
@ -1168,7 +1165,7 @@ bool deployQmlImports(const QString &appDirPath, DeploymentInfo deploymentInfo, |
|
|
|
if (deploymentInfo.deployedLibraries.contains("QtWidgets") && qtQuickContolsInUse) { |
|
|
|
LogNormal() << "Deploying QML import 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); |
|
|
|
LogNormal() << ""; |
|
|
|
} |
|
|
|