646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
17 lines
813 B
Diff
17 lines
813 B
Diff
--- 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);
|