diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-09-25 10:48:09 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-09-28 12:37:03 +0200 |
| commit | 03c194a8a854405888dc0cf82d5930c77d39d885 (patch) | |
| tree | 6e16b9bcad32e1115d2ea1842d5162eaaeda9c6c /src/macdeployqt/shared | |
| parent | da951dd6aad8e00f31a9fe4fe4dafc8303a82a4f (diff) | |
Fix compile warning: QLibraryInfo::path instead of location
Change-Id: I701bbffaea2ea4c9237980cf18383038045fe28e
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/macdeployqt/shared')
| -rw-r--r-- | src/macdeployqt/shared/shared.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp index aaf66d2a8..8b15245ba 100644 --- a/src/macdeployqt/shared/shared.cpp +++ b/src/macdeployqt/shared/shared.cpp @@ -973,7 +973,7 @@ DeploymentInfo deployQtFrameworks(QList<FrameworkInfo> frameworks, deploymentInfo.isDebug = true; if (deploymentInfo.qtPath.isNull()) - deploymentInfo.qtPath = QLibraryInfo::location(QLibraryInfo::PrefixPath); + deploymentInfo.qtPath = QLibraryInfo::path(QLibraryInfo::PrefixPath); if (framework.frameworkDirectory.startsWith(bundlePath)) { LogError() << framework.frameworkName << "already deployed, skipping."; @@ -1032,7 +1032,7 @@ DeploymentInfo deployQtFrameworks(const QString &appBundlePath, const QStringLis QStringList allBinaryPaths = QStringList() << applicationBundle.binaryPath << applicationBundle.libraryPaths << additionalExecutables; QSet<QString> allLibraryPaths = getBinaryRPaths(applicationBundle.binaryPath, true); - allLibraryPaths.insert(QLibraryInfo::location(QLibraryInfo::LibrariesPath)); + allLibraryPaths.insert(QLibraryInfo::path(QLibraryInfo::LibrariesPath)); QList<FrameworkInfo> frameworks = getQtFrameworksForPaths(allBinaryPaths, appBundlePath, allLibraryPaths, useDebugLibs); if (frameworks.isEmpty() && !alwaysOwerwriteEnabled) { LogWarning(); @@ -1255,7 +1255,7 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf LogNormal() << "QML module search path(s) is" << qmlImportPaths; // Use qmlimportscanner from QLibraryInfo::BinariesPath - QString qmlImportScannerPath = QDir::cleanPath(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlimportscanner"); + QString qmlImportScannerPath = QDir::cleanPath(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlimportscanner"); // Fallback: Look relative to the macdeployqt binary if (!QFile(qmlImportScannerPath).exists()) @@ -1277,7 +1277,7 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf } for (const QString &importPath : qmlImportPaths) argumentList << "-importPath" << importPath; - QString qmlImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); + QString qmlImportsPath = QLibraryInfo::path(QLibraryInfo::Qml2ImportsPath); argumentList.append( "-importPath"); argumentList.append(qmlImportsPath); |