BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #292237 from NickCao/qt6-path

Browse source 
qt6.qtbase: search PATH for plugins after search QT_PLUGIN_PATH
This commit is contained in:
Nick Cao 2024-02-29 09:53:31 -05:00 committed by GitHub
commit 219c7a812b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pkgs/development/libraries/qt-6/patches/0011-qtbase-derive-plugin-load-path-from-PATH.patch
View file

@ -1,19 +1,19 @@
From f0c4d3860b75cb064d066045907622d536044096 Mon Sep 17 00:00:00 2001 From 6f0e6fe1e13ca5844a93d3b97111b7ece7e60f0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <me@pbb.lc> From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <me@pbb.lc>
Date: Sun, 10 May 2020 12:47:28 +0200 Date: Sun, 10 May 2020 12:47:28 +0200
Subject: [PATCH 11/11] qtbase: derive plugin load path from PATH Subject: [PATCH 11/11] qtbase: derive plugin load path from PATH
--- ---
src/corelib/kernel/qcoreapplication.cpp | 10 ++++++++++ src/corelib/kernel/qcoreapplication.cpp | 9 +++++++++
1 file changed, 10 insertions(+) 1 file changed, 9 insertions(+)
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index a80efbb5622..8cf9e85da43 100644 index a80efbb5622..0d41dabeed3 100644
--- a/src/corelib/kernel/qcoreapplication.cpp --- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -2991,6 +2991,16 @@ QStringList QCoreApplication::libraryPathsLocked() @@ -3032,6 +3032,15 @@ QStringList QCoreApplication::libraryPathsLocked()
QStringList *app_libpaths = new QStringList; app_libpaths->append(installPathPlugins);
coreappdata()->app_libpaths.reset(app_libpaths); }
+ // Add library paths derived from PATH + // Add library paths derived from PATH
+ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(QStringLiteral(":")); + const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(QStringLiteral(":"));
@ -24,10 +24,9 @@ index a80efbb5622..8cf9e85da43 100644
+ } + }
+ } + }
+ +
+ // If QCoreApplication is not yet instantiated,
auto setPathsFromEnv = [&](QString libPathEnv) { // make sure we add the application path when we construct the QCoreApplication
if (!libPathEnv.isEmpty()) { if (self) self->d_func()->appendApplicationPathToLibraryPaths();
QStringList paths = libPathEnv.split(QDir::listSeparator(), Qt::SkipEmptyParts);
-- --
2.42.0 2.43.1