mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-23 22:23:15 +00:00
79c0e740a7
This needs to be the full path for qtmacdeploy to work. We add
${qt5.qttools.dev}/bin/qmlimportscanner as the default.
Fixes #63093
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;
|