diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-02-28 09:37:57 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-03-04 15:08:47 -0600 |
| commit | cd7d8a60b44a80bab95b1cfceb58b27443bce502 (patch) | |
| tree | 70c95f96cbfdebcffb75964fa8af553b43d68782 /pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch | |
| parent | a368a80c90f1a0ccffb59017e1900e87b9c66824 (diff) | |
| download | nixlib-cd7d8a60b44a80bab95b1cfceb58b27443bce502.tar nixlib-cd7d8a60b44a80bab95b1cfceb58b27443bce502.tar.gz nixlib-cd7d8a60b44a80bab95b1cfceb58b27443bce502.tar.bz2 nixlib-cd7d8a60b44a80bab95b1cfceb58b27443bce502.tar.lz nixlib-cd7d8a60b44a80bab95b1cfceb58b27443bce502.tar.xz nixlib-cd7d8a60b44a80bab95b1cfceb58b27443bce502.tar.zst nixlib-cd7d8a60b44a80bab95b1cfceb58b27443bce502.zip | |
qt58: init at 5.8.0
Qt 5.8 is now the default version.
Diffstat (limited to 'pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch new file mode 100644 index 000000000000..a0e344a7bc68 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch @@ -0,0 +1,16 @@ +Index: qtbase-opensource-src-5.7.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +=================================================================== +--- qtbase-opensource-src-5.7.0.orig/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp ++++ qtbase-opensource-src-5.7.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +@@ -257,10 +257,7 @@ void TableGenerator::initPossibleLocatio + // the QTCOMPOSE environment variable + 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("${libX11}/share/X11/locale")); + m_possibleLocations.append(QStringLiteral(X11_PREFIX "/share/X11/locale")); + m_possibleLocations.append(QStringLiteral(X11_PREFIX "/lib/X11/locale")); + } |