From 6303df4ac202d792dd1a352d8e06abd77bb0d4b3 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 25 May 2021 18:39:44 +0200 Subject: CMake: Use qmlimportscanner from libexec folder MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adapts to qtdeclarative's c4425426278c1f5e94d51b465a746ab6a5ff74d7 Task-number: QTBUG-88791 Change-Id: I26d090818a17b194a4a206e184f406a43d259e3b Reviewed-by: Tor Arne Vestbø --- src/macdeployqt/shared/shared.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/macdeployqt/shared/shared.cpp') diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp index a44a4f284..0b18dbe6e 100644 --- a/src/macdeployqt/shared/shared.cpp +++ b/src/macdeployqt/shared/shared.cpp @@ -1260,8 +1260,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 - QString qmlImportScannerPath = QDir::cleanPath(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlimportscanner"); + // 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()) -- cgit v1.2.3