5d3b55ecde
- Added patches from upstream: 0001-Speed-up-compose-file-parsing-in-the-X11-composition.patch 0002-Speed-up-application-startup-on-X11.patch and Fix-regression-in-compose-table-parsing.patch - Add cleaning of QMAKE_PRL_BUILD_DIR from prl files in %qmake5_install macro OBS-URL: https://build.opensuse.org/request/show/297744 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=39
33 lines
1.5 KiB
Diff
33 lines
1.5 KiB
Diff
From 4e3b27ffc2f2d4d528abbbe58ee43acce0700fb2 Mon Sep 17 00:00:00 2001
|
|
From: Simon Hausmann <simon.hausmann@theqtcompany.com>
|
|
Date: Fri, 10 Apr 2015 08:46:37 +0200
|
|
Subject: [PATCH 1/2] Speed up compose file parsing in the X11 composition
|
|
input method plugin
|
|
|
|
There's no need to decode the string until the end of the line, it's
|
|
sufficient to stop at the end of the quotes.
|
|
|
|
Change-Id: Ie617d2538511e91d0e0146f98b7e5ea3213b8db2
|
|
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
(cherry picked from commit 1aab68648d3aa38811be38b5bbd3a0704e17ccf8)
|
|
---
|
|
src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
|
|
index 4e90f618765e7a9a0509af7282500c133f11d3e3..622c71e5b01219cd39d594557a9d3ca63eea8748 100644
|
|
--- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
|
|
+++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
|
|
@@ -399,7 +399,7 @@ void TableGenerator::parseKeySequence(char *line)
|
|
// handle direct text encoded in the locale
|
|
if (*composeValue == '\\')
|
|
++composeValue;
|
|
- elem.value = QString::fromLocal8Bit(composeValue).at(0).unicode();
|
|
+ elem.value = QString::fromLocal8Bit(composeValue, composeValueEnd - composeValue).at(0).unicode();
|
|
++composeValue;
|
|
}
|
|
|
|
--
|
|
2.3.5
|
|
|