- Makefile-patch ( gcc -> g++ in some files ) solve compile and link problems for qt embedded 2.3.7

1 files changed, 151 insertions, 0 deletions

diff --git a/qt/qt-2.3.7.patch/qte237-all.patch b/qt/qt-2.3.7.patch/qte237-all.patch
index e6cf0a4..cb09109 100644
--- a/qt/qt-2.3.7.patch/qte237-all.patch
+++ b/qt/qt-2.3.7.patch/qte237-all.patch
@@ -390,32 +390,183 @@ diff -ru qt-2.3.5_fresh/src/widgets/qtoolbutton.cpp qt-2.3.5/src/widgets/qtoolbu
  }
  
  
 @@ -324,12 +324,12 @@
  	QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Large, QIconSet::Normal);
  	w = pm.width();
  	h = pm.height();
 -	if ( w < 32 )
 -	    w = 32;
 -	if ( h < 32 )
 -	    h = 32;
 +	if ( w < 24 )
 +	    w = 24;
 +	if ( h < 24 )
 +	    h = 24;
      } else {
 -	w = h = 16;
 +	w = h = 14;
  	QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Small, QIconSet::Normal);
  	w = pm.width();
  	h = pm.height();
 --- qt-2.3.7/src/kernel/qkeyboard_qws.cpp~c7xxrotate	2003-07-16 18:20:25.000000000 -0700
 +++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp	2003-12-07 15:54:10.000000000 -0800
 @@ -238,7 +238,7 @@
      {	Qt::Key_unknown,	0xffff  , 0xffff  , 0xffff  }, // 63
      {	Qt::Key_unknown,	0xffff  , 0xffff  , 0xffff  }, // 64
      {	Qt::Key_unknown,	0xffff  , 0xffff  , 0xffff  }, // 65
 -    {	Qt::Key_unknown,	0xffff  , 0xffff  , 0xffff  }, // 66
 +    {   Qt::Key_F14,    0xffff  , 0xffff  , 0xffff  }, // 66
      {	Qt::Key_Meta,		0xffff  , 0xffff  , 0xffff  }, // 67
      {	Qt::Key_unknown,	0xffff  , 0xffff  , 0xffff  }, // 68
      {	Qt::Key_unknown,	0xffff  , 0xffff  , 0xffff  }, // 69
+diff -ru qt-2.3.7/configs/linux-generic-g++-shared qte/configs/linux-generic-g++-shared
+--- qt-2.3.7/configs/linux-generic-g++-shared	2003-07-17 03:23:08.000000000 +0200
++++ qte/configs/linux-generic-g++-shared	2004-03-01 20:08:00.884254576 +0100
+@@ -36,7 +36,7 @@
+ SYSCONF_LIBS_YACC	= 
+ 
+ # Linking applications
+-SYSCONF_LINK		= gcc
++SYSCONF_LINK		= g++
+ SYSCONF_LFLAGS		= 
+ SYSCONF_LIBS		= 
+ 
+Nur in qte/configs: linux-generic-g++-shared~.
+diff -ru qt-2.3.7/configs/linux-generic-g++-shared-debug qte/configs/linux-generic-g++-shared-debug
+--- qt-2.3.7/configs/linux-generic-g++-shared-debug	2003-07-17 03:23:08.000000000 +0200
++++ qte/configs/linux-generic-g++-shared-debug	2004-03-01 20:08:06.552392888 +0100
+@@ -36,7 +36,7 @@
+ SYSCONF_LIBS_YACC	= 
+ 
+ # Linking applications
+-SYSCONF_LINK		= gcc
++SYSCONF_LINK		= g++
+ SYSCONF_LFLAGS		= 
+ SYSCONF_LIBS		= 
+ 
+Nur in qte/configs: linux-generic-g++-shared-debug~.
+diff -ru qt-2.3.7/configs/linux-generic-g++-static qte/configs/linux-generic-g++-static
+--- qt-2.3.7/configs/linux-generic-g++-static	2003-07-17 03:23:08.000000000 +0200
++++ qte/configs/linux-generic-g++-static	2004-03-01 20:08:11.410654320 +0100
+@@ -36,7 +36,7 @@
+ SYSCONF_LIBS_YACC	= 
+ 
+ # Linking applications
+-SYSCONF_LINK		= gcc
++SYSCONF_LINK		= g++
+ SYSCONF_LFLAGS		= 
+ SYSCONF_LIBS		= 
+ 
+Nur in qte/configs: linux-generic-g++-static~.
+diff -ru qt-2.3.7/configs/linux-generic-g++-static-debug qte/configs/linux-generic-g++-static-debug
+--- qt-2.3.7/configs/linux-generic-g++-static-debug	2003-07-17 03:23:08.000000000 +0200
++++ qte/configs/linux-generic-g++-static-debug	2004-03-01 20:08:15.780989928 +0100
+@@ -36,7 +36,7 @@
+ SYSCONF_LIBS_YACC	= 
+ 
+ # Linking applications
+-SYSCONF_LINK		= gcc
++SYSCONF_LINK		= g++
+ SYSCONF_LFLAGS		= 
+ SYSCONF_LIBS		= 
+ 
+Nur in qte/configs: linux-generic-g++-static-debug~.
+diff -ru qt-2.3.7/configs/linux-generic_rtti-g++-shared qte/configs/linux-generic_rtti-g++-shared
+--- qt-2.3.7/configs/linux-generic_rtti-g++-shared	2003-07-17 03:23:08.000000000 +0200
++++ qte/configs/linux-generic_rtti-g++-shared	2004-03-01 20:08:20.393288752 +0100
+@@ -36,7 +36,7 @@
+ SYSCONF_LIBS_YACC	= 
+ 
+ # Linking applications
+-SYSCONF_LINK		= gcc
++SYSCONF_LINK		= g++
+ SYSCONF_LFLAGS		= 
+ SYSCONF_LIBS		= 
+ 
+Nur in qte/configs: linux-generic_rtti-g++-shared~.
+diff -ru qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug qte/configs/linux-generic_rtti-g++-shared-debug
+--- qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug	2003-07-17 03:23:08.000000000 +0200
++++ qte/configs/linux-generic_rtti-g++-shared-debug	2004-03-01 20:08:25.127569032 +0100
+@@ -36,7 +36,7 @@
+ SYSCONF_LIBS_YACC	= 
+ 
+ # Linking applications
+-SYSCONF_LINK		= gcc
++SYSCONF_LINK		= g++
+ SYSCONF_LFLAGS		= 
+ SYSCONF_LIBS		= 
+ 
+Nur in qte/configs: linux-generic_rtti-g++-shared-debug~.
+diff -ru qt-2.3.7/configs/linux-generic_rtti-g++-static qte/configs/linux-generic_rtti-g++-static
+--- qt-2.3.7/configs/linux-generic_rtti-g++-static	2003-07-17 03:23:08.000000000 +0200
++++ qte/configs/linux-generic_rtti-g++-static	2004-03-01 20:08:29.727869680 +0100
+@@ -36,7 +36,7 @@
+ SYSCONF_LIBS_YACC	= 
+ 
+ # Linking applications
+-SYSCONF_LINK		= gcc
++SYSCONF_LINK		= g++
+ SYSCONF_LFLAGS		= 
+ SYSCONF_LIBS		= 
+ 
+Nur in qte/configs: linux-generic_rtti-g++-static~.
+diff -ru qt-2.3.7/configs/linux-generic_rtti-g++-static-debug qte/configs/linux-generic_rtti-g++-static-debug
+--- qt-2.3.7/configs/linux-generic_rtti-g++-static-debug	2003-07-17 03:23:08.000000000 +0200
++++ qte/configs/linux-generic_rtti-g++-static-debug	2004-03-01 20:06:12.806684864 +0100
+@@ -36,7 +36,7 @@
+ SYSCONF_LIBS_YACC	= 
+ 
+ # Linking applications
+-SYSCONF_LINK		= gcc
++SYSCONF_LINK		= g++
+ SYSCONF_LFLAGS		= 
+ SYSCONF_LIBS		= 
+ 
+Nur in qte/configs: linux-generic_rtti-g++-static-debug~.
+diff -ru qt-2.3.7/configs/linux-x86rtti-g++-shared qte/configs/linux-x86rtti-g++-shared
+--- qt-2.3.7/configs/linux-x86rtti-g++-shared	2003-07-17 03:23:10.000000000 +0200
++++ qte/configs/linux-x86rtti-g++-shared	2004-03-01 19:54:16.977507440 +0100
+@@ -36,7 +36,7 @@
+ SYSCONF_LIBS_YACC	= 
+ 
+ # Linking applications
+-SYSCONF_LINK		= gcc
++SYSCONF_LINK		= g++
+ SYSCONF_LFLAGS		= 
+ SYSCONF_LIBS		= -lm
+ 
+diff -ru qt-2.3.7/configs/linux-x86rtti-g++-shared-debug qte/configs/linux-x86rtti-g++-shared-debug
+--- qt-2.3.7/configs/linux-x86rtti-g++-shared-debug	2003-07-17 03:23:10.000000000 +0200
++++ qte/configs/linux-x86rtti-g++-shared-debug	2004-03-01 19:54:24.064430064 +0100
+@@ -36,7 +36,7 @@
+ SYSCONF_LIBS_YACC	= 
+ 
+ # Linking applications
+-SYSCONF_LINK		= gcc
++SYSCONF_LINK		= g++
+ SYSCONF_LFLAGS		= 
+ SYSCONF_LIBS		= -lm
+ 
+diff -ru qt-2.3.7/configs/linux-x86rtti-g++-static qte/configs/linux-x86rtti-g++-static
+--- qt-2.3.7/configs/linux-x86rtti-g++-static	2003-07-17 03:23:10.000000000 +0200
++++ qte/configs/linux-x86rtti-g++-static	2004-03-01 19:54:32.020220600 +0100
+@@ -36,7 +36,7 @@
+ SYSCONF_LIBS_YACC	= 
+ 
+ # Linking applications
+-SYSCONF_LINK		= gcc
++SYSCONF_LINK		= g++
+ SYSCONF_LFLAGS		= 
+ SYSCONF_LIBS		= -lm
+ 
+diff -ru qt-2.3.7/configs/linux-x86rtti-g++-static-debug qte/configs/linux-x86rtti-g++-static-debug
+--- qt-2.3.7/configs/linux-x86rtti-g++-static-debug	2003-07-17 03:23:10.000000000 +0200
++++ qte/configs/linux-x86rtti-g++-static-debug	2004-03-01 19:54:41.434789368 +0100
+@@ -36,7 +36,7 @@
+ SYSCONF_LIBS_YACC	= 
+ 
+ # Linking applications
+-SYSCONF_LINK		= gcc
++SYSCONF_LINK		= g++
+ SYSCONF_LFLAGS		= 
+ SYSCONF_LIBS		= -lm