K900
2873053688
- move patches to their corresponding modules - inline patches list for qtbase into the expression itself - don't treat patches as series, as they are not - clean up outdated headers from all the patches - drop doc tools patch, replace it with setting newly added cmake var in a hook - add a new patch to disable SBOM generation that's very broken with split installs
18 lines
776 B
Diff
18 lines
776 B
Diff
--- a/src/tools/macdeployqt/shared/shared.cpp
|
|
+++ b/src/tools/macdeployqt/shared/shared.cpp
|
|
@@ -1300,9 +1300,12 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf
|
|
}
|
|
for (const QString &importPath : qmlImportPaths)
|
|
argumentList << "-importPath" << importPath;
|
|
+
|
|
QString qmlImportsPath = QLibraryInfo::path(QLibraryInfo::QmlImportsPath);
|
|
- argumentList.append( "-importPath");
|
|
- argumentList.append(qmlImportsPath);
|
|
+ if (QFile::exists(qmlImportsPath)) {
|
|
+ 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
|