diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2021-02-05 18:15:27 +0100 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2021-02-09 21:49:26 +0100 |
commit | e73cd68362f2a3b0eddf225e71da6ba5e4641b17 (patch) | |
tree | b4d9b8691fadb25035a13a164cece1c9218fc2a0 /src/macdeployqt | |
parent | 2836c1535258c2942a3908a806d79da70a5cf0fa (diff) |
Use QLibraryInfo::QmlImportsPath rather than Qml2ImportsPath
The "2" is meaningless, and we get a better name now.
Task-number: QTBUG-85064
Change-Id: Ia4b98a3fdcd9aea3ac9f9009c6eecd64020f8c24
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/macdeployqt')
-rw-r--r-- | src/macdeployqt/shared/shared.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp index e72ca8e4a..ac1f5777c 100644 --- a/src/macdeployqt/shared/shared.cpp +++ b/src/macdeployqt/shared/shared.cpp @@ -1246,7 +1246,7 @@ static bool importLessThan(const QVariant &v1, const QVariant &v2) return path1 < path2; } -// Scan qml files in qmldirs for import statements, deploy used imports from Qml2ImportsPath to Contents/Resources/qml. +// Scan qml files in qmldirs for import statements, deploy used imports from QmlImportsPath to Contents/Resources/qml. bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInfo, QStringList &qmlDirs, QStringList &qmlImportPaths) { LogNormal() << ""; @@ -1277,7 +1277,7 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf } for (const QString &importPath : qmlImportPaths) argumentList << "-importPath" << importPath; - QString qmlImportsPath = QLibraryInfo::path(QLibraryInfo::Qml2ImportsPath); + QString qmlImportsPath = QLibraryInfo::path(QLibraryInfo::QmlImportsPath); argumentList.append( "-importPath"); argumentList.append(qmlImportsPath); |