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
16 lines
703 B
Diff
16 lines
703 B
Diff
--- a/src/macdeployqt/shared/shared.cpp
|
|
+++ b/src/macdeployqt/shared/shared.cpp
|
|
@@ -1241,6 +1241,12 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf
|
|
if (!QFile(qmlImportScannerPath).exists())
|
|
qmlImportScannerPath = QCoreApplication::applicationDirPath() + "/qmlimportscanner";
|
|
|
|
+#ifdef NIXPKGS_QMLIMPORTSCANNER
|
|
+ // Fallback: Nixpkgs hardcoded path
|
|
+ if (!QFile(qmlImportScannerPath).exists())
|
|
+ qmlImportScannerPath = NIXPKGS_QMLIMPORTSCANNER;
|
|
+#endif
|
|
+
|
|
// Verify that we found a qmlimportscanner binary
|
|
if (!QFile(qmlImportScannerPath).exists()) {
|
|
LogError() << "qmlimportscanner not found at" << qmlImportScannerPath;
|