2017-04-15 17:11:32 +01:00
|
|
|
Index: qtbase-opensource-src-5.8.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
|
2017-02-28 15:37:57 +00:00
|
|
|
===================================================================
|
2017-04-15 17:11:32 +01:00
|
|
|
--- qtbase-opensource-src-5.8.0.orig/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
|
|
|
|
+++ qtbase-opensource-src-5.8.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
|
2017-04-15 17:23:48 +01:00
|
|
|
@@ -258,12 +258,9 @@ void TableGenerator::initPossibleLocatio
|
2017-04-15 17:11:32 +01:00
|
|
|
m_possibleLocations.reserve(7);
|
2017-02-28 15:37:57 +00:00
|
|
|
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"));
|
2017-04-15 17:23:48 +01:00
|
|
|
+ m_possibleLocations.append(QStringLiteral(NIXPKGS_QTCOMPOSE));
|
2017-02-28 15:37:57 +00:00
|
|
|
}
|
2017-04-15 17:23:48 +01:00
|
|
|
|
|
|
|
QString TableGenerator::findComposeFile()
|