646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
From 7a9f4f875053aed8ab387161eea623bf8325cfa8 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Tuegel <ttuegel@mailbox.org>
|
|
Date: Tue, 17 Sep 2019 05:35:33 -0500
|
|
Subject: [PATCH 06/11] qtbase-gtk3
|
|
|
|
---
|
|
src/plugins/platformthemes/gtk3/main.cpp | 17 ++++++++++++++++-
|
|
1 file changed, 16 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp
|
|
index 860fc3a26e..8cd4663d49 100644
|
|
--- a/src/plugins/platformthemes/gtk3/main.cpp
|
|
+++ b/src/plugins/platformthemes/gtk3/main.cpp
|
|
@@ -39,6 +39,7 @@
|
|
|
|
#include <qpa/qplatformthemeplugin.h>
|
|
#include "qgtk3theme.h"
|
|
+#include <QFile>
|
|
|
|
QT_BEGIN_NAMESPACE
|
|
|
|
@@ -54,8 +55,22 @@ public:
|
|
QPlatformTheme *QGtk3ThemePlugin::create(const QString &key, const QStringList ¶ms)
|
|
{
|
|
Q_UNUSED(params);
|
|
- if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive))
|
|
+ if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive)) {
|
|
+
|
|
+#ifdef NIXPKGS_QGTK3_XDG_DATA_DIRS
|
|
+ QStringList XDG_DATA_DIRS = QFile::decodeName(qgetenv("XDG_DATA_DIRS")).split(':');
|
|
+ XDG_DATA_DIRS << QLatin1String(NIXPKGS_QGTK3_XDG_DATA_DIRS);
|
|
+ qputenv("XDG_DATA_DIRS", QFile::encodeName(XDG_DATA_DIRS.join(':')));
|
|
+#endif
|
|
+
|
|
+#ifdef NIXPKGS_QGTK3_GIO_EXTRA_MODULES
|
|
+ QStringList GIO_EXTRA_MODULES = QFile::decodeName(qgetenv("GIO_EXTRA_MODULES")).split(':');
|
|
+ GIO_EXTRA_MODULES << QLatin1String(NIXPKGS_QGTK3_GIO_EXTRA_MODULES);
|
|
+ qputenv("GIO_EXTRA_MODULES", QFile::encodeName(GIO_EXTRA_MODULES.join(':')));
|
|
+#endif
|
|
+
|
|
return new QGtk3Theme;
|
|
+ }
|
|
|
|
return nullptr;
|
|
}
|
|
--
|
|
2.25.4
|
|
|