[SCM] qtbase packaging branch, experimental, updated. debian/5.10.0+dfsg-2-16-g82a1f4d

Dmitry Shachnev mitya57 at moszumanska.debian.org
Fri Jan 19 14:23:07 UTC 2018


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=82a1f4d

The following commit has been merged in the experimental branch:
commit 82a1f4d51a4f38bf3957215a7c83e7f4726a8a4d
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Jan 19 17:23:00 2018 +0300

    Refresh debian/patches/dead_key_symbols.diff for 5.10.0.
---
 debian/patches/dead_key_symbols.diff | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/patches/dead_key_symbols.diff b/debian/patches/dead_key_symbols.diff
index 5ba260e..47257c6 100644
--- a/debian/patches/dead_key_symbols.diff
+++ b/debian/patches/dead_key_symbols.diff
@@ -4,7 +4,7 @@ Last-Update: 2018-01-19
 
 --- a/src/corelib/global/qnamespace.h
 +++ b/src/corelib/global/qnamespace.h
-@@ -840,6 +840,36 @@
+@@ -846,6 +846,36 @@
          Key_Dead_Belowdot       = 0x01001260,
          Key_Dead_Hook           = 0x01001261,
          Key_Dead_Horn           = 0x01001262,
@@ -43,7 +43,7 @@ Last-Update: 2018-01-19
          Key_Back  = 0x01000061,
 --- a/src/corelib/global/qnamespace.qdoc
 +++ b/src/corelib/global/qnamespace.qdoc
-@@ -1594,6 +1594,36 @@
+@@ -1613,6 +1613,36 @@
      
alue Key_Dead_Belowdot
      
alue Key_Dead_Hook
      
alue Key_Dead_Horn
@@ -290,7 +290,7 @@ Last-Update: 2018-01-19
  
      // Special keys from X.org - This include multimedia keys,
          // wireless/bluetooth/uwb keys, special launcher keys, etc.
-@@ -1124,7 +1215,7 @@
+@@ -1117,7 +1208,7 @@
          modifiers |= Qt::KeypadModifier;
      } else if (text.length() == 1 && text.unicode()->unicode() > 0x1f
                                    && text.unicode()->unicode() != 0x7f

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list