31 lines
1.5 KiB
Diff
31 lines
1.5 KiB
Diff
|
From 7211024a1d54232f9a6f91f7aac467e0e8893691 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Tuegel <ttuegel@mailbox.org>
|
||
|
|
Date: Tue, 17 Sep 2019 05:36:10 -0500
|
||
|
|
Subject: [PATCH 07/10] qtbase-xcompose
|
||
|
|
|
||
|
|
---
|
||
|
|
.../compose/generator/qtablegenerator.cpp | 5 +----
|
||
|
|
1 file changed, 1 insertion(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
|
||
|
|
index b5a0a5bb..6c20305f 100644
|
||
|
|
--- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
|
||
|
|
+++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
|
||
|
|
@@ -265,12 +265,9 @@ void TableGenerator::initPossibleLocations()
|
||
|
|
m_possibleLocations.reserve(7);
|
||
|
|
if (qEnvironmentVariableIsSet("QTCOMPOSE"))
|
||
|
|
m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE")));
|
||
|
|
- m_possibleLocations.append(QStringLiteral("/usr/share/X11/locale"));
|
||
|
|
- m_possibleLocations.append(QStringLiteral("/usr/local/share/X11/locale"));
|
||
|
|
- m_possibleLocations.append(QStringLiteral("/usr/lib/X11/locale"));
|
||
|
|
- m_possibleLocations.append(QStringLiteral("/usr/local/lib/X11/locale"));
|
||
|
|
m_possibleLocations.append(QStringLiteral(X11_PREFIX "/share/X11/locale"));
|
||
|
|
m_possibleLocations.append(QStringLiteral(X11_PREFIX "/lib/X11/locale"));
|
||
|
|
+ m_possibleLocations.append(QLatin1String(NIXPKGS_QTCOMPOSE));
|
||
|
|
}
|
||
|
|
|
||
|
|
QString TableGenerator::findComposeFile()
|
||
|
|
--
|
||
|
|
2.22.1
|
||
|
|
|