rev 11409 - in trunk/packages/qt4-x11/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2008-07-09 00:30:07 +0000 (Wed, 09 Jul 2008)
New Revision: 11409

Added:
   trunk/packages/qt4-x11/debian/patches/0236-qtoolbararealayout-restore.diff
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/series
Log:
Add 0236-qtoolbararealayout-restore.diff to fix a regression in qt4.4.
Patch from Trolltech.

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2008-07-09 00:27:49 UTC (rev 11408)
+++ trunk/packages/qt4-x11/debian/changelog	2008-07-09 00:30:07 UTC (rev 11409)
@@ -12,6 +12,8 @@
     of Mike Hommey in the gtk webkit package.
   * Add 0235-qdbus-dispatch-async-timeout.diff from qt copy. Acked in qt-copy
     by Thiago.
+  * Add 0236-qtoolbararealayout-restore.diff to fix a regression in qt4.4.
+    Patch from Trolltech.
 
   +++ Changes by Modestas Vainius:
 

Added: trunk/packages/qt4-x11/debian/patches/0236-qtoolbararealayout-restore.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0236-qtoolbararealayout-restore.diff	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/0236-qtoolbararealayout-restore.diff	2008-07-09 00:30:07 UTC (rev 11409)
@@ -0,0 +1,23 @@
+qt-bugs@ issue : N218280
+Trolltech task ID : 218280
+bugs.kde.org number : none
+applied: yes
+author: TT
+
+QMainWindow::restoreState doesn't layout toolbars properly, regression
+from Qt-4.4
+
+Index: src/gui/widgets/qtoolbararealayout.cpp
+===================================================================
+--- src/gui/widgets/qtoolbararealayout.cpp	(revision 829449)
++++ src/gui/widgets/qtoolbararealayout.cpp	(working copy)
+@@ -1323,7 +1323,8 @@ bool QToolBarAreaLayout::restoreState(QD
+                 toolBar->setVisible(shown);
+                 toolBar->d_func()->setWindowState(floating, true, rect);
+ 
+-                item.extraSpace = item.size - pick(line.o, item.sizeHint());
++                //if it is -1, it means we should use the default size
++                item.extraSpace = (item.size == -1) ? 0 : item.size - pick(line.o, item.sizeHint());
+ 
+ 
+                 line.toolBarItems.append(item);

Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series	2008-07-09 00:27:49 UTC (rev 11408)
+++ trunk/packages/qt4-x11/debian/patches/series	2008-07-09 00:30:07 UTC (rev 11409)
@@ -21,6 +21,7 @@
 0233-fix-q3textbrowser-image.diff
 
 # debian patches
+0236-qtoolbararealayout-restore.diff
 0235-qdbus-dispatch-async-timeout.diff
 01_qmake_for_debian.diff
 02_launch_assistant-qt4.diff