[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-160-g7a23039

[jscheer <js...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  7a2303918bec16737a0e035d2ea80dea0b8c1080 (commit)
      from  e06d8d1e8d3b998d8b036729236bc7bd33996acf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7a2303918bec16737a0e035d2ea80dea0b8c1080
Author: Jeremie Scheer <jer...@ar...>
Date:   Tue Feb 12 10:14:35 2013 +0100

    [BUILDROOT] Map Keys Meta and Menu in Qt QWS Server's keyboard maps.

-----------------------------------------------------------------------

Summary of changes:
 ...-qt-full_integration_with_cross_compiling.patch |   27 ++++++++++++++++++-
 patches/buildroot/2012.02/cleanup_buildroot.sh     |    1 +
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/patches/buildroot/2012.02/132-qt-full_integration_with_cross_compiling.patch b/patches/buildroot/2012.02/132-qt-full_integration_with_cross_compiling.patch
index 68ce2df..4609d50 100644
--- a/patches/buildroot/2012.02/132-qt-full_integration_with_cross_compiling.patch
+++ b/patches/buildroot/2012.02/132-qt-full_integration_with_cross_compiling.patch
@@ -5,7 +5,7 @@ Signed-off-by: Jérémie Scheer <jer...@ar...>
 Index: buildroot/package/qt/Config.in
 ===================================================================
 --- buildroot.orig/package/qt/Config.in	2012-02-29 23:19:47.000000000 +0100
-+++ buildroot/package/qt/Config.in	2013-01-11 14:09:10.000000000 +0100
++++ buildroot/package/qt/Config.in	2013-02-11 17:36:11.000000000 +0100
 @@ -17,7 +17,12 @@
  	  If unsure, say N.
  
@@ -23,7 +23,7 @@ Index: buildroot/package/qt/Config.in
 Index: buildroot/package/qt/qt.mk
 ===================================================================
 --- buildroot.orig/package/qt/qt.mk	2012-02-29 23:19:47.000000000 +0100
-+++ buildroot/package/qt/qt.mk	2013-01-11 14:11:10.000000000 +0100
++++ buildroot/package/qt/qt.mk	2013-02-11 17:36:11.000000000 +0100
 @@ -14,7 +14,7 @@
  
  QT_VERSION = 4.7.4
@@ -50,3 +50,26 @@ Index: buildroot/package/qt/qt.mk
  endif
  
  # ensure glib is built first if enabled for Qt's glib support
+Index: buildroot/package/qt/qt-4.7.4-map_keyboard_keys_metas_and_menu.patch
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/qt/qt-4.7.4-map_keyboard_keys_metas_and_menu.patch	2013-02-11 18:18:46.000000000 +0100
+@@ -0,0 +1,18 @@
++Add keys Meta (left and right) and Menu to QWS keyboard maps.
++
++Signed-off-by: Jeremie Scheer <jer...@ar...>
++
++Index: qt-4.7.4/src/gui/embedded/qkbd_defaultmap_qws_p.h
++===================================================================
++--- qt-4.7.4.orig/src/gui/embedded/qkbd_defaultmap_qws_p.h	2011-03-31 22:28:16.530647168 +0200
+++++ qt-4.7.4/src/gui/embedded/qkbd_defaultmap_qws_p.h	2011-03-31 22:29:38.908081695 +0200
++@@ -643,6 +643,9 @@
++     { 111, 0xffff, 0x01000000, 0x06, 0x08, 0x0200 },
++     { 111, 0xffff, 0x01000000, 0x0c, 0x08, 0x0200 },
++     { 119, 0xffff, 0x01000008, 0x00, 0x00, 0x0000 },
+++    { 125, 0xffff, 0x01000022, 0x00, 0x00, 0x0000 }, // Key_Meta (left)
+++    { 126, 0xffff, 0x01000022, 0x00, 0x00, 0x0000 }, // Key_Meta (right)
+++    { 127, 0xffff, 0x01000055, 0x00, 0x00, 0x0000 }, // Key_Menu
++ };
++
++ const QWSKeyboard::Composing QWSKbPrivate::s_keycompose_default[] = {
diff --git a/patches/buildroot/2012.02/cleanup_buildroot.sh b/patches/buildroot/2012.02/cleanup_buildroot.sh
index 11c392b..bd98625 100755
--- a/patches/buildroot/2012.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2012.02/cleanup_buildroot.sh
@@ -80,3 +80,4 @@ rm -rf buildroot/package/tar/tar-1.26-no-gets.patch
 rm -rf buildroot/package/cunit/
 rm -rf buildroot/package/qextserialport/
 rm -rf buildroot/package/compat-wireless/
+rm -rf buildroot/package/qt/qt-4.7.4-map_keyboard_keys_metas_and_menu.patch


hooks/post-receive
-- 
armadeus