28 lines
1.2 KiB
Diff
28 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Nick Cao <nickcao@nichi.co>
|
|
Date: Tue, 10 Oct 2023 10:12:56 -0400
|
|
Subject: [PATCH] qtbase: pass to qmlimportscanner the QML2_IMPORT_PATH
|
|
|
|
---
|
|
src/tools/macdeployqt/shared/shared.cpp | 7 +++++++
|
|
1 file changed, 7 insertions(+)
|
|
|
|
diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp
|
|
index b7ee93f6fc1..57b68627eba 100644
|
|
--- a/src/tools/macdeployqt/shared/shared.cpp
|
|
+++ b/src/tools/macdeployqt/shared/shared.cpp
|
|
@@ -1300,6 +1300,13 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf
|
|
argumentList.append( "-importPath");
|
|
argumentList.append(qmlImportsPath);
|
|
|
|
+ // In a modularized installation of qt as we have in Nix, instead, we will
|
|
+ // read the paths from the environment, as they are spread in multiple
|
|
+ // locations and normally set in the environment like this
|
|
+ auto envQmlImportPaths = ::qgetenv("QML2_IMPORT_PATH").split(':');
|
|
+ for (const QString &importPath : envQmlImportPaths)
|
|
+ argumentList << "-importPath" << importPath;
|
|
+
|
|
// run qmlimportscanner
|
|
QProcess qmlImportScanner;
|
|
qmlImportScanner.start(qmlImportScannerPath, argumentList);
|