nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
at python-updates 48 lines 1.6 kB view raw
1From 7a9f4f875053aed8ab387161eea623bf8325cfa8 Mon Sep 17 00:00:00 2001 2From: Thomas Tuegel <ttuegel@mailbox.org> 3Date: Tue, 17 Sep 2019 05:35:33 -0500 4Subject: [PATCH 06/11] qtbase-gtk3 5 6--- 7 src/plugins/platformthemes/gtk3/main.cpp | 17 ++++++++++++++++- 8 1 file changed, 16 insertions(+), 1 deletion(-) 9 10diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp 11index 860fc3a26e..8cd4663d49 100644 12--- a/src/plugins/platformthemes/gtk3/main.cpp 13+++ b/src/plugins/platformthemes/gtk3/main.cpp 14@@ -39,6 +39,7 @@ 15 16 #include <qpa/qplatformthemeplugin.h> 17 #include "qgtk3theme.h" 18+#include <QFile> 19 20 QT_BEGIN_NAMESPACE 21 22@@ -54,8 +55,22 @@ public: 23 QPlatformTheme *QGtk3ThemePlugin::create(const QString &key, const QStringList &params) 24 { 25 Q_UNUSED(params); 26- if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive)) 27+ if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive)) { 28+ 29+#ifdef NIXPKGS_QGTK3_XDG_DATA_DIRS 30+ QStringList XDG_DATA_DIRS = QFile::decodeName(qgetenv("XDG_DATA_DIRS")).split(':'); 31+ XDG_DATA_DIRS << QLatin1String(NIXPKGS_QGTK3_XDG_DATA_DIRS); 32+ qputenv("XDG_DATA_DIRS", QFile::encodeName(XDG_DATA_DIRS.join(':'))); 33+#endif 34+ 35+#ifdef NIXPKGS_QGTK3_GIO_EXTRA_MODULES 36+ QStringList GIO_EXTRA_MODULES = QFile::decodeName(qgetenv("GIO_EXTRA_MODULES")).split(':'); 37+ GIO_EXTRA_MODULES << QLatin1String(NIXPKGS_QGTK3_GIO_EXTRA_MODULES); 38+ qputenv("GIO_EXTRA_MODULES", QFile::encodeName(GIO_EXTRA_MODULES.join(':'))); 39+#endif 40+ 41 return new QGtk3Theme; 42+ } 43 44 return nullptr; 45 } 46-- 472.25.4 48