From 46d927291c76414cd37eb7329de0624fb3f57283 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Thu, 19 Aug 2021 19:13:43 +0200 Subject: [PATCH] macdeployqt: Adapt upstream change --- 3rdparty/macdeployqt/shared.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/3rdparty/macdeployqt/shared.cpp b/3rdparty/macdeployqt/shared.cpp index f56c5f17..2808d9ef 100644 --- a/3rdparty/macdeployqt/shared.cpp +++ b/3rdparty/macdeployqt/shared.cpp @@ -1435,12 +1435,10 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf LogNormal() << "Application QML file path(s) is" << qmlDirs; LogNormal() << "QML module search path(s) is" << qmlImportPaths; - // Use qmlimportscanner from QLibraryInfo::BinariesPath -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) - QString qmlImportScannerPath = QDir::cleanPath(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlimportscanner"); -#else - QString qmlImportScannerPath = QDir::cleanPath(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlimportscanner"); -#endif + // Use qmlimportscanner from QLibraryInfo::LibraryExecutablesPath + QString qmlImportScannerPath = + QDir::cleanPath(QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath) + + "/qmlimportscanner"); // Fallback: Look relative to the macdeployqt binary if (!QFile(qmlImportScannerPath).exists())