summaryrefslogtreecommitdiff
path: root/qt/qt-2.3.7.patch
authorar <ar>2004-03-01 19:49:05 (UTC)
committer ar <ar>2004-03-01 19:49:05 (UTC)
commit4ffae5ecb25f6d640c69f53f02755b6ec58d4c98 (patch) (side-by-side diff)
tree9cc4399897533ccf20c0c235c286983c30fc5949 /qt/qt-2.3.7.patch
parent18ea562480a63f504f4dc8e3f46c1db9d2cd6276 (diff)
downloadopie-4ffae5ecb25f6d640c69f53f02755b6ec58d4c98.zip
opie-4ffae5ecb25f6d640c69f53f02755b6ec58d4c98.tar.gz
opie-4ffae5ecb25f6d640c69f53f02755b6ec58d4c98.tar.bz2
- Makefile-patch ( gcc -> g++ in some files ) solve compile and link problems for qt embedded 2.3.7
Diffstat (limited to 'qt/qt-2.3.7.patch') (more/less context) (ignore whitespace changes)
-rw-r--r--qt/qt-2.3.7.patch/qte237-all.patch151
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
@@ -358,64 +358,215 @@ diff -ru qt-2.3.5_fresh/src/widgets/qcommonstyle.cpp qt-2.3.5/src/widgets/qcommo
#ifndef QT_NO_MENUBAR
-#ifndef QT_NO_STYLE_SGI
+#if 1 // #ifndef QT_NO_STYLE_SGI
if (draw_menu_bar_impl != 0) {
QDrawMenuBarItemImpl impl = draw_menu_bar_impl;
(this->*impl)(p, x, y, w, h, mi, g, enabled, active);
Nur in qt-2.3.5/src/widgets: qcommonstyle.cpp.orig.
diff -ru qt-2.3.5_fresh/src/widgets/qlistview.cpp qt-2.3.5/src/widgets/qlistview.cpp
--- qt-2.3.5_fresh/src/widgets/qlistview.cpp 2003-05-13 15:56:12.000000000 +0200
+++ qt-2.3.5/src/widgets/qlistview.cpp 2003-05-13 15:58:18.000000000 +0200
@@ -4968,9 +4968,9 @@
l = l->childItem ? l->childItem : l->siblingItem;
if ( l && l->height() )
- s.setHeight( s.height() + 10 * l->height() );
- else
- s.setHeight( s.height() + 140 );
+ s.setHeight( s.height() + 4 /*10*/ * l->height() );
+ else // ^v much too big for handhelds
+ s.setHeight( s.height() + 30 /*140*/ );
if ( s.width() > s.height() * 3 )
s.setHeight( s.width() / 3 );
diff -ru qt-2.3.5_fresh/src/widgets/qtoolbutton.cpp qt-2.3.5/src/widgets/qtoolbutton.cpp
--- qt-2.3.5_fresh/src/widgets/qtoolbutton.cpp 2003-05-13 15:56:12.000000000 +0200
+++ qt-2.3.5/src/widgets/qtoolbutton.cpp 2003-05-13 15:58:18.000000000 +0200
@@ -230,7 +230,7 @@
else
QToolTip::add( this, textLabel );
}
-#endif
+#endif
}
@@ -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