summaryrefslogtreecommitdiff
path: root/qt
authordrw <drw>2005-02-28 17:40:44 (UTC)
committer drw <drw>2005-02-28 17:40:44 (UTC)
commit772bc43173a3155ef08c769f1d01ef0ec7b31bcd (patch) (side-by-side diff)
tree678a5cdeb431bca63299c3b595c26a0a6639a3f3 /qt
parent2b64a84d39eeed5681d0ee5068c7d11a01527750 (diff)
downloadopie-772bc43173a3155ef08c769f1d01ef0ec7b31bcd.zip
opie-772bc43173a3155ef08c769f1d01ef0ec7b31bcd.tar.gz
opie-772bc43173a3155ef08c769f1d01ef0ec7b31bcd.tar.bz2
Added QT patch for QTabBar which fixes problems with the scroll buttons in OTabWidget
Diffstat (limited to 'qt') (more/less context) (ignore whitespace changes)
-rw-r--r--qt/qt-2.3.10.patch/qtabbar.patch39
-rw-r--r--qt/qt-2.3.10.patch/qte-2.3.10-all.patch63
2 files changed, 88 insertions, 14 deletions
diff --git a/qt/qt-2.3.10.patch/qtabbar.patch b/qt/qt-2.3.10.patch/qtabbar.patch
new file mode 100644
index 0000000..6940ec9
--- a/dev/null
+++ b/qt/qt-2.3.10.patch/qtabbar.patch
@@ -0,0 +1,39 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- qt-2.3.10/src/widgets/qtabbar.cpp~qtabbar
++++ qt-2.3.10/src/widgets/qtabbar.cpp
+@@ -260,7 +260,6 @@
+ lstatic->insert( index, newTab );
+
+ layoutTabs();
+- updateArrowButtons();
+ makeVisible( tab( currentTab() ) );
+
+ #ifndef QT_NO_ACCEL
+@@ -282,7 +281,6 @@
+ l->remove( t );
+ lstatic->remove( t );
+ layoutTabs();
+- updateArrowButtons();
+ makeVisible( tab( currentTab() ) );
+ update();
+ }
+@@ -887,6 +885,7 @@
+ }
+ for ( t = lstatic->first(); t; t = lstatic->next() )
+ t->r.setHeight( r.height() );
++ updateArrowButtons();
+ }
+
+ /*!
+@@ -977,7 +976,6 @@
+ d->leftB->setGeometry( width() - 2*arrowWidth, 0, arrowWidth, height() );
+ #endif
+ layoutTabs();
+- updateArrowButtons();
+ makeVisible( tab( currentTab() ));
+ }
+
diff --git a/qt/qt-2.3.10.patch/qte-2.3.10-all.patch b/qt/qt-2.3.10.patch/qte-2.3.10-all.patch
index ab52716..24bac51 100644
--- a/qt/qt-2.3.10.patch/qte-2.3.10-all.patch
+++ b/qt/qt-2.3.10.patch/qte-2.3.10-all.patch
@@ -37,3 +37,3 @@ Index: qt-2.3.10/src/iconview/qiconview.cpp
}
-
+
/*!
@@ -83,3 +83,3 @@ Index: qt-2.3.10/src/iconview/qiconview.cpp
*/
-
+
@@ -4939,7 +4985,7 @@
@@ -95,3 +95,3 @@ Index: qt-2.3.10/src/iconview/qiconview.cpp
return;
-
+
if ( item->d->container1 && d->firstContainer ) {
@@ -114,3 +114,3 @@ Index: qt-2.3.10/src/iconview/qiconview.cpp
item->d->container2 = 0;
-
+
Index: qt-2.3.10/src/iconview/qiconview.h
@@ -122,3 +122,3 @@ Index: qt-2.3.10/src/iconview/qiconview.h
#endif
-
+
+ void bufferedPaintEvent( QPaintEvent* );
@@ -134,3 +134,3 @@ Index: qt-2.3.10/src/kernel/qgfxraster_qws.cpp
*(alphaptr++)=get_value_32(16,(unsigned char **)&temppos);
-
+
- PackType temp2;
@@ -151,3 +151,3 @@ Index: qt-2.3.10/src/kernel/qgfxraster_qws.cpp
}
-
+
Index: qt-2.3.10/src/kernel/qwindowsystem_qws.cpp
@@ -159,3 +159,3 @@ Index: qt-2.3.10/src/kernel/qwindowsystem_qws.cpp
}
-
+
+static void catchSegvSignal( int )
@@ -177,3 +177,3 @@ Index: qt-2.3.10/src/kernel/qwindowsystem_qws.cpp
}
-
+
signal(SIGPIPE, ignoreSignal); //we get it when we read
@@ -193,3 +193,3 @@ Index: qt-2.3.10/src/kernel/qwsdecoration_qws.h
+ Menu=15, LastRegion=Menu, UserDefined = 100 };
-
+
virtual QRegion region(const QWidget *, const QRect &rect, Region r=All) = 0;
@@ -203,6 +203,6 @@ Index: qt-2.3.10/src/tools/qcstring.h
// ### TODO for 4.0: completely remove these and the cstr* functions
-
+
-#if !defined(QT_GENUINE_STR)
+#if 0
-
+
#undef strlen
@@ -259,3 +259,3 @@ Index: qt-2.3.10/src/widgets/qlistview.cpp
l = l->childItem ? l->childItem : l->siblingItem;
-
+
if ( l && l->height() )
@@ -267,3 +267,3 @@ Index: qt-2.3.10/src/widgets/qlistview.cpp
+ s.setHeight( s.height() + 30 /*140*/ );
-
+
if ( s.width() > s.height() * 3 )
@@ -292 +292,36 @@ Index: qt-2.3.10/src/widgets/qtoolbutton.cpp
h = pm.height();
+Index: qt-2.3.10/src/widgets/qtabbar.cpp
+===================================================================
+--- qt-2.3.10.orig/src/widgets/qtabbar.cpp 2005-02-27 18:07:41.000000000 -0600
++++ qt-2.3.10/src/widgets/qtabbar.cpp 2005-02-28 11:16:56.444377440 -0600
+@@ -260,7 +260,6 @@
+ lstatic->insert( index, newTab );
+
+ layoutTabs();
+- updateArrowButtons();
+ makeVisible( tab( currentTab() ) );
+
+ #ifndef QT_NO_ACCEL
+@@ -282,7 +281,6 @@
+ l->remove( t );
+ lstatic->remove( t );
+ layoutTabs();
+- updateArrowButtons();
+ makeVisible( tab( currentTab() ) );
+ update();
+ }
+@@ -887,6 +885,7 @@
+ }
+ for ( t = lstatic->first(); t; t = lstatic->next() )
+ t->r.setHeight( r.height() );
++ updateArrowButtons();
+ }
+
+ /*!
+@@ -977,7 +976,6 @@
+ d->leftB->setGeometry( width() - 2*arrowWidth, 0, arrowWidth, height() );
+ #endif
+ layoutTabs();
+- updateArrowButtons();
+ makeVisible( tab( currentTab() ));
+ }