diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-05-25 18:39:44 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-05-25 18:53:21 +0200 |
| commit | 6303df4ac202d792dd1a352d8e06abd77bb0d4b3 (patch) | |
| tree | fe645801f4a629f39fb09499402f5d2b9325c425 /src/macdeployqt/shared/shared.cpp | |
| parent | d6c98c9afcdabc0a427cfb5e885f5f900c572be7 (diff) | |
CMake: Use qmlimportscanner from libexec folder
Adapts to qtdeclarative's c4425426278c1f5e94d51b465a746ab6a5ff74d7
Task-number: QTBUG-88791
Change-Id: I26d090818a17b194a4a206e184f406a43d259e3b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/macdeployqt/shared/shared.cpp')
| -rw-r--r-- | src/macdeployqt/shared/shared.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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()) |