summaryrefslogtreecommitdiff
authordrw <drw>2005-02-28 17:40:44 (UTC)
committer drw <drw>2005-02-28 17:40:44 (UTC)
commit772bc43173a3155ef08c769f1d01ef0ec7b31bcd (patch) (unidiff)
tree678a5cdeb431bca63299c3b595c26a0a6639a3f3
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 (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 @@
1
2#
3# Patch managed by http://www.holgerschurig.de/patcher.html
4#
5
6--- qt-2.3.10/src/widgets/qtabbar.cpp~qtabbar
7+++ qt-2.3.10/src/widgets/qtabbar.cpp
8@@ -260,7 +260,6 @@
9 lstatic->insert( index, newTab );
10
11 layoutTabs();
12- updateArrowButtons();
13 makeVisible( tab( currentTab() ) );
14
15 #ifndef QT_NO_ACCEL
16@@ -282,7 +281,6 @@
17 l->remove( t );
18 lstatic->remove( t );
19 layoutTabs();
20- updateArrowButtons();
21 makeVisible( tab( currentTab() ) );
22 update();
23 }
24@@ -887,6 +885,7 @@
25 }
26 for ( t = lstatic->first(); t; t = lstatic->next() )
27 t->r.setHeight( r.height() );
28+ updateArrowButtons();
29 }
30
31 /*!
32@@ -977,7 +976,6 @@
33 d->leftB->setGeometry( width() - 2*arrowWidth, 0, arrowWidth, height() );
34 #endif
35 layoutTabs();
36- updateArrowButtons();
37 makeVisible( tab( currentTab() ));
38 }
39
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
37 } 37 }
38 38
39 /*! 39 /*!
@@ -83,3 +83,3 @@ Index: qt-2.3.10/src/iconview/qiconview.cpp
83 */ 83 */
84 84
85@@ -4939,7 +4985,7 @@ 85@@ -4939,7 +4985,7 @@
@@ -95,3 +95,3 @@ Index: qt-2.3.10/src/iconview/qiconview.cpp
95 return; 95 return;
96 96
97 if ( item->d->container1 && d->firstContainer ) { 97 if ( item->d->container1 && d->firstContainer ) {
@@ -114,3 +114,3 @@ Index: qt-2.3.10/src/iconview/qiconview.cpp
114 item->d->container2 = 0; 114 item->d->container2 = 0;
115 115
116Index: qt-2.3.10/src/iconview/qiconview.h 116Index: qt-2.3.10/src/iconview/qiconview.h
@@ -122,3 +122,3 @@ Index: qt-2.3.10/src/iconview/qiconview.h
122 #endif 122 #endif
123 123
124+ void bufferedPaintEvent( QPaintEvent* ); 124+ void bufferedPaintEvent( QPaintEvent* );
@@ -134,3 +134,3 @@ Index: qt-2.3.10/src/kernel/qgfxraster_qws.cpp
134 *(alphaptr++)=get_value_32(16,(unsigned char **)&temppos); 134 *(alphaptr++)=get_value_32(16,(unsigned char **)&temppos);
135 135
136 -PackType temp2; 136 -PackType temp2;
@@ -151,3 +151,3 @@ Index: qt-2.3.10/src/kernel/qgfxraster_qws.cpp
151 } 151 }
152 152
153Index: qt-2.3.10/src/kernel/qwindowsystem_qws.cpp 153Index: qt-2.3.10/src/kernel/qwindowsystem_qws.cpp
@@ -159,3 +159,3 @@ Index: qt-2.3.10/src/kernel/qwindowsystem_qws.cpp
159 } 159 }
160 160
161+static void catchSegvSignal( int ) 161+static void catchSegvSignal( int )
@@ -177,3 +177,3 @@ Index: qt-2.3.10/src/kernel/qwindowsystem_qws.cpp
177 } 177 }
178 178
179 signal(SIGPIPE, ignoreSignal); //we get it when we read 179 signal(SIGPIPE, ignoreSignal); //we get it when we read
@@ -193,3 +193,3 @@ Index: qt-2.3.10/src/kernel/qwsdecoration_qws.h
193 + Menu=15, LastRegion=Menu, UserDefined = 100 }; 193 + Menu=15, LastRegion=Menu, UserDefined = 100 };
194 194
195 virtual QRegion region(const QWidget *, const QRect &rect, Region r=All) = 0; 195 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
203 // ### TODO for 4.0: completely remove these and the cstr* functions 203 // ### TODO for 4.0: completely remove these and the cstr* functions
204 204
205-#if !defined(QT_GENUINE_STR) 205-#if !defined(QT_GENUINE_STR)
206+#if 0 206+#if 0
207 207
208 #undefstrlen 208 #undefstrlen
@@ -259,3 +259,3 @@ Index: qt-2.3.10/src/widgets/qlistview.cpp
259 l = l->childItem ? l->childItem : l->siblingItem; 259 l = l->childItem ? l->childItem : l->siblingItem;
260 260
261 if ( l && l->height() ) 261 if ( l && l->height() )
@@ -267,3 +267,3 @@ Index: qt-2.3.10/src/widgets/qlistview.cpp
267 +s.setHeight( s.height() + 30 /*140*/ ); 267 +s.setHeight( s.height() + 30 /*140*/ );
268 268
269 if ( s.width() > s.height() * 3 ) 269 if ( s.width() > s.height() * 3 )
@@ -292 +292,36 @@ Index: qt-2.3.10/src/widgets/qtoolbutton.cpp
292 h = pm.height(); 292 h = pm.height();
293Index: qt-2.3.10/src/widgets/qtabbar.cpp
294===================================================================
295 --- qt-2.3.10.orig/src/widgets/qtabbar.cpp2005-02-27 18:07:41.000000000 -0600
296 +++ qt-2.3.10/src/widgets/qtabbar.cpp2005-02-28 11:16:56.444377440 -0600
297@@ -260,7 +260,6 @@
298 lstatic->insert( index, newTab );
299
300 layoutTabs();
301- updateArrowButtons();
302 makeVisible( tab( currentTab() ) );
303
304 #ifndef QT_NO_ACCEL
305@@ -282,7 +281,6 @@
306 l->remove( t );
307 lstatic->remove( t );
308 layoutTabs();
309- updateArrowButtons();
310 makeVisible( tab( currentTab() ) );
311 update();
312 }
313@@ -887,6 +885,7 @@
314 }
315 for ( t = lstatic->first(); t; t = lstatic->next() )
316 t->r.setHeight( r.height() );
317+ updateArrowButtons();
318 }
319
320 /*!
321@@ -977,7 +976,6 @@
322 d->leftB->setGeometry( width() - 2*arrowWidth, 0, arrowWidth, height() );
323 #endif
324 layoutTabs();
325- updateArrowButtons();
326 makeVisible( tab( currentTab() ));
327 }