first round of patches to qt embedded 2.3.4

3 files changed, 85 insertions, 0 deletions

diff --git a/qt/qte234-for-opie091-menubar.patch b/qt/qte234-for-opie091-menubar.patch
new file mode 100644
index 0000000..9e64890
--- a/dev/null
+++ b/qt/qte234-for-opie091-menubar.patch
@@ -0,0 +1,51 @@
+diff -bur3 src.orig/widgets/qmenubar.cpp src/widgets/qmenubar.cpp
+--- src.orig/widgets/qmenubar.cpp	Mon Mar 18 02:11:27 2002
++++ src/widgets/qmenubar.cpp	Sun Sep  1 19:31:09 2002
+@@ -187,6 +187,7 @@
+     hasmouse = 0;
+     defaultup = 0;
+     toggleclose = 0;
++    openedbymove = 0;
+     if ( parent ) {
+ 	// filter parent events for resizing
+ 	parent->installEventFilter( this );
+@@ -906,7 +907,7 @@
+ 	return;
+     mouseBtDn = TRUE;				// mouse button down
+     int item = itemAtPos( e->pos() );
+-    if ( item == actItem && popupvisible )
++    if ( item == actItem && popupvisible && !openedbymove )
+ 	toggleclose = 1;
+     setActiveItem( item, TRUE, FALSE );
+ }
+@@ -932,6 +933,7 @@
+ 	showMenu = FALSE;
+     setActiveItem( item, showMenu, !hasMouseTracking() );
+     toggleclose = 0;
++    openedbymove = 0;
+ }
+ 
+ 
+@@ -951,8 +953,10 @@
+ 	setActiveItem( item, FALSE, FALSE );
+ 	return;
+     }
+-    if ( item != actItem && item >= 0  && ( popupvisible || mouseBtDn ) )
++    if ( item != actItem && item >= 0  && ( popupvisible || mouseBtDn ) ) {
+ 	setActiveItem( item, TRUE, FALSE );
++	openedbymove = 1;
++    }
+ }
+ 
+ 
+diff -bur3 src.orig/widgets/qmenubar.h src/widgets/qmenubar.h
+--- src.orig/widgets/qmenubar.h	Mon Mar 18 02:11:27 2002
++++ src/widgets/qmenubar.h	Sun Sep  1 15:54:37 2002
+@@ -139,6 +139,7 @@
+     uint	hasmouse : 1;
+     uint 	defaultup : 1;
+     uint 	toggleclose : 1;
++    uint 	openedbymove : 1;
+ 
+     friend class QPopupMenu;
+ 
diff --git a/qt/qte234-for-opie091-style.patch b/qt/qte234-for-opie091-style.patch
new file mode 100644
index 0000000..1944da8
--- a/dev/null
+++ b/qt/qte234-for-opie091-style.patch
@@ -0,0 +1,11 @@
+--- src.orig/widgets/qcommonstyle.cpp	Mon Mar 18 02:11:26 2002
++++ src/widgets/qcommonstyle.cpp	Fri Aug 30 04:28:27 2002
+@@ -562,7 +562,7 @@
+ 				    bool enabled, bool active )
+ {
+ #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);
diff --git a/qt/qte234-for-opie091-unpolish.patch b/qt/qte234-for-opie091-unpolish.patch
new file mode 100644
index 0000000..ba9e9b3
--- a/dev/null
+++ b/qt/qte234-for-opie091-unpolish.patch
@@ -0,0 +1,23 @@
+--- src.orig/kernel/qapplication.cpp	Mon Mar 18 02:11:25 2002
++++ src/kernel/qapplication.cpp	Fri Aug 30 04:28:34 2002
+@@ -930,10 +930,10 @@
+ void QApplication::setStyle( QStyle *style )
+ {
+     QStyle* old = app_style;
+-    app_style = style;
+ 
+     if ( startingUp() ) {
+ 	delete old;
++	app_style = style;
+ 	return;
+     }
+ 
+@@ -954,6 +954,8 @@
+ 	old->unPolish( qApp );
+     }
+ 
++    app_style = style;
++ 
+     // take care of possible palette requirements of certain gui
+     // styles. Do it before polishing the application since the style
+     // might call QApplication::setStyle() itself