f6c48afebe
the fix for bnc#866051 and bnc#866709, the patches for bnc#866051 will part of Qt 5.3 but since it's important for on-the-fly keyboard layout remapping, should worth included them before 5.3 release. also change %suse_version to 1315 just because of current SLES12 use 1315 as its version number (forwarded request 229475 from mlin7442) OBS-URL: https://build.opensuse.org/request/show/229476 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=17
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From 5819ffe492cf3cd98718819b1bd837819318d82e Mon Sep 17 00:00:00 2001
|
|
From: Egbert Eich <eich@suse.de>
|
|
Date: Sun, 6 Apr 2014 16:54:03 +0200
|
|
Subject: [PATCH] [xcb/xsettings] Byte order byte is at address 0
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Accoring to
|
|
http://standards.freedesktop.org\
|
|
/xsettings-spec/xsettings-spec-0.5.html
|
|
the byte order byte is address 0 (not 1).
|
|
|
|
Change-Id: I441084a7f24908dd8a504648bfc50ba2d486a586
|
|
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
|
|
---
|
|
src/plugins/platforms/xcb/qxcbxsettings.cpp | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/plugins/platforms/xcb/qxcbxsettings.cpp b/src/plugins/platforms/xcb/qxcbxsettings.cpp
|
|
index 26d95e9..17b40a4 100644
|
|
--- a/src/plugins/platforms/xcb/qxcbxsettings.cpp
|
|
+++ b/src/plugins/platforms/xcb/qxcbxsettings.cpp
|
|
@@ -150,7 +150,7 @@ public:
|
|
{
|
|
if (xSettings.length() < 12)
|
|
return;
|
|
- char byteOrder = xSettings.at(1);
|
|
+ char byteOrder = xSettings.at(0);
|
|
if (byteOrder != LSBFirst && byteOrder != MSBFirst) {
|
|
qWarning("%s ByteOrder byte %d not 0 or 1", Q_FUNC_INFO , byteOrder);
|
|
return;
|
|
--
|
|
1.8.4.5
|
|
|