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
19 lines
889 B
Diff
19 lines
889 B
Diff
--- a/src/corelib/kernel/qcoreapplication.cpp
|
|
+++ b/src/corelib/kernel/qcoreapplication.cpp
|
|
@@ -3038,6 +3038,15 @@ QStringList QCoreApplication::libraryPathsLocked()
|
|
app_libpaths->append(installPathPlugins);
|
|
}
|
|
|
|
+ // Add library paths derived from PATH
|
|
+ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(QStringLiteral(":"));
|
|
+ const QString plugindir = QStringLiteral("../" NIXPKGS_QT_PLUGIN_PREFIX);
|
|
+ for (const QString &path: paths) {
|
|
+ if (!path.isEmpty()) {
|
|
+ app_libpaths->append(QDir::cleanPath(path + QDir::separator() + plugindir));
|
|
+ }
|
|
+ }
|
|
+
|
|
// If QCoreApplication is not yet instantiated,
|
|
// make sure we add the application path when we construct the QCoreApplication
|
|
if (self) self->d_func()->appendApplicationPathToLibraryPaths();
|