[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-368-g6b496a5

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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  6b496a5cea9b63aaf9c47073921d637e92d22735 (commit)
      from  bd2235dac1a955d748720d3313a337f7f9232fa8 (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 6b496a5cea9b63aaf9c47073921d637e92d22735
Author: Jeremie Scheer <jer...@ar...>
Date:   Thu Feb 24 14:20:44 2011 +0100

    [BUILDROOT] Add QWS Cursor option to Qt's Buildroot menuconfig.

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

Summary of changes:
 ...-qt-full_integration_with_cross_compiling.patch |   39 +++++++++++++++----
 ...-qt-full_integration_with_cross_compiling.patch |   41 ++++++++++++++++----
 2 files changed, 64 insertions(+), 16 deletions(-)

diff --git a/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch b/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
index a7e215e..ab04674 100644
--- a/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
+++ b/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
@@ -5,9 +5,22 @@ Signed-off-by: JÃ©rÃ©mie Scheer <jer...@ar...>
 
 Index: buildroot/package/qtopia4/Config.in
 ===================================================================
---- buildroot.orig/package/qtopia4/Config.in	2011-01-03 10:54:42.000000000 +0100
-+++ buildroot/package/qtopia4/Config.in	2011-01-03 10:54:42.000000000 +0100
-@@ -325,4 +325,14 @@
+--- buildroot.orig/package/qtopia4/Config.in	2011-02-24 12:16:39.000000000 +0100
++++ buildroot/package/qtopia4/Config.in	2011-02-24 13:51:52.000000000 +0100
+@@ -214,6 +214,12 @@
+ 	bool "Use Qt bundled libtiff"
+ endchoice
+ 
++config BR2_PACKAGE_QT_QWS_CURSOR
++	bool "QWS cursor"
++	default y
++	help
++	  Display a QWS cursor on the target GUI.
++
+ endif # BR2_PACKAGE_QT_GUI_MODULE
+ 
+ choice
+@@ -325,4 +331,14 @@
  	  Build the Qt Script Tools module.
  	  if unsure, say n.
  
@@ -24,8 +37,8 @@ Index: buildroot/package/qtopia4/Config.in
  endif # BR2_PACKAGE_QT
 Index: buildroot/package/qtopia4/qtopia4.mk
 ===================================================================
---- buildroot.orig/package/qtopia4/qtopia4.mk	2011-01-03 10:54:42.000000000 +0100
-+++ buildroot/package/qtopia4/qtopia4.mk	2011-01-03 17:22:36.000000000 +0100
+--- buildroot.orig/package/qtopia4/qtopia4.mk	2011-02-24 12:16:39.000000000 +0100
++++ buildroot/package/qtopia4/qtopia4.mk	2011-02-24 13:52:27.000000000 +0100
 @@ -17,6 +17,7 @@
  QT_SITE:=http://get.qt.nokia.com/qt/source
  QT_CAT:=$(ZCAT)
@@ -34,7 +47,17 @@ Index: buildroot/package/qtopia4/qtopia4.mk
  
  QT_CONFIGURE:=#empty
  
-@@ -345,6 +346,14 @@
+@@ -256,6 +257,9 @@
+ endif
+ endif
+ 
++ifneq ($(BR2_PACKAGE_QT_QWS_CURSOR),y)
++QT_CONFIGURE+= -DQT_NO_QWS_CURSOR
++endif
+ 
+ QT_FONTS = $(addprefix $(STAGING_DIR)/usr/lib/fonts/, $(addsuffix *.qpf, \
+ 	   $(if $(BR2_PACKAGE_QT_FONT_MICRO),micro) \
+@@ -345,6 +349,14 @@
  QT_CONFIGURE+= -no-stl
  endif
  
@@ -49,7 +72,7 @@ Index: buildroot/package/qtopia4/qtopia4.mk
  # ccache and precompiled headers don't play well together
  ifeq ($(BR2_CCACHE),y)
  QT_CONFIGURE += -no-pch
-@@ -483,11 +492,11 @@
+@@ -483,11 +495,11 @@
  		-no-accessibility \
  		-no-separate-debug-info \
  		-prefix /usr \
@@ -63,7 +86,7 @@ Index: buildroot/package/qtopia4/qtopia4.mk
  	)
  	touch $@
  
-@@ -560,8 +569,19 @@
+@@ -560,8 +572,19 @@
  	cp -dpf $(STAGING_DIR)/usr/lib/libQtScriptTools.so.* $(TARGET_DIR)/usr/lib/
  endif
  
diff --git a/patches/buildroot/2010.11/132-qt-full_integration_with_cross_compiling.patch b/patches/buildroot/2010.11/132-qt-full_integration_with_cross_compiling.patch
index 985a279..586b14e 100644
--- a/patches/buildroot/2010.11/132-qt-full_integration_with_cross_compiling.patch
+++ b/patches/buildroot/2010.11/132-qt-full_integration_with_cross_compiling.patch
@@ -4,8 +4,8 @@ Signed-off-by: JÃ©rÃ©mie Scheer <jer...@ar...>
 
 Index: buildroot/package/qt/Config.in
 ===================================================================
---- buildroot.orig/package/qt/Config.in	2010-11-08 10:24:59.000000000 +0100
-+++ buildroot/package/qt/Config.in	2011-01-03 14:04:23.000000000 +0100
+--- buildroot.orig/package/qt/Config.in	2010-11-30 16:52:43.000000000 +0100
++++ buildroot/package/qt/Config.in	2011-02-24 13:41:41.000000000 +0100
 @@ -17,7 +17,12 @@
  	  If unsure, say N.
  
@@ -20,11 +20,25 @@ Index: buildroot/package/qt/Config.in
  	help
  	  If unsure, say N.
  
+@@ -219,6 +224,13 @@
+ 	bool "Use Qt bundled libtiff"
+ endchoice
+ 
++config BR2_PACKAGE_QT_QWS_CURSOR
++	bool "QWS cursor"
++	default y
++	help
++	  Display a QWS cursor on the target GUI.
++
++
+ endif # BR2_PACKAGE_QT_GUI_MODULE
+ 
+ choice
 Index: buildroot/package/qt/qt.mk
 ===================================================================
---- buildroot.orig/package/qt/qt.mk	2010-11-08 10:24:59.000000000 +0100
-+++ buildroot/package/qt/qt.mk	2011-01-03 17:33:36.000000000 +0100
-@@ -49,10 +49,16 @@
+--- buildroot.orig/package/qt/qt.mk	2010-11-30 16:52:43.000000000 +0100
++++ buildroot/package/qt/qt.mk	2011-02-24 13:41:10.000000000 +0100
+@@ -49,11 +49,17 @@
  endif
  
  ifeq ($(BR2_PACKAGE_QT_DEMOS),y)
@@ -33,13 +47,24 @@ Index: buildroot/package/qt/qt.mk
  else
 -QT_CONFIGURE+= -nomake examples -nomake demos
 +QT_CONFIGURE+= -nomake demos
- endif
++endif
 +ifeq ($(BR2_PACKAGE_QT_EXAMPLES),y)
 +QT_CONFIGURE+= -examplesdir $(TARGET_DIR)/usr/share/qt/examples
 +else
 +QT_CONFIGURE+= -nomake examples
-+endif
-+
+ endif
  
++
  # ensure glib is built first if enabled for Qt's glib support
  ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
+ QT_DEP_LIBS+=libglib2
+@@ -244,6 +250,9 @@
+ endif
+ endif
+ 
++ifneq ($(BR2_PACKAGE_QT_QWS_CURSOR),y)
++QT_CONFIGURE+= -DQT_NO_QWS_CURSOR
++endif
+ 
+ QT_FONTS = $(addprefix $(STAGING_DIR)/usr/lib/fonts/, $(addsuffix *.qpf, \
+ 	   $(if $(BR2_PACKAGE_QT_FONT_MICRO),micro) \


hooks/post-receive
-- 
armadeus


