rev 11410 - trunk/packages/qt4-x11/debian/patches

[Sune Vuorela]

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

Modified:
   trunk/packages/qt4-x11/debian/patches/0235-qdbus-dispatch-async-timeout.diff
   trunk/packages/qt4-x11/debian/patches/0236-qtoolbararealayout-restore.diff
   trunk/packages/qt4-x11/debian/patches/series
Log:
fix recently committed patches to be applied with -p1 as expected. also reorder patches properly in series file

Modified: trunk/packages/qt4-x11/debian/patches/0235-qdbus-dispatch-async-timeout.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0235-qdbus-dispatch-async-timeout.diff	2008-07-09 00:30:07 UTC (rev 11409)
+++ trunk/packages/qt4-x11/debian/patches/0235-qdbus-dispatch-async-timeout.diff	2008-07-09 00:31:31 UTC (rev 11410)
@@ -8,8 +8,8 @@
 after handling them. This is neccessary in order to receive timeout
 errors to asynchroneous messages.
 
---- src/dbus/qdbusintegrator.cpp	(Revision 827848)
-+++ src/dbus/qdbusintegrator.cpp	(Arbeitskopie)
+--- a/src/dbus/qdbusintegrator.cpp	(Revision 827848)
++++ b/src/dbus/qdbusintegrator.cpp	(Arbeitskopie)
 @@ -988,6 +988,7 @@
  {
      DBusTimeout *timeout = timeouts.value(e->timerId(), 0);

Modified: trunk/packages/qt4-x11/debian/patches/0236-qtoolbararealayout-restore.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0236-qtoolbararealayout-restore.diff	2008-07-09 00:30:07 UTC (rev 11409)
+++ trunk/packages/qt4-x11/debian/patches/0236-qtoolbararealayout-restore.diff	2008-07-09 00:31:31 UTC (rev 11410)
@@ -7,10 +7,10 @@
 QMainWindow::restoreState doesn't layout toolbars properly, regression
 from Qt-4.4
 
-Index: src/gui/widgets/qtoolbararealayout.cpp
+Index: a/src/gui/widgets/qtoolbararealayout.cpp
 ===================================================================
---- src/gui/widgets/qtoolbararealayout.cpp	(revision 829449)
-+++ src/gui/widgets/qtoolbararealayout.cpp	(working copy)
+--- a/src/gui/widgets/qtoolbararealayout.cpp	(revision 829449)
++++ b/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);

Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series	2008-07-09 00:30:07 UTC (rev 11409)
+++ trunk/packages/qt4-x11/debian/patches/series	2008-07-09 00:31:31 UTC (rev 11410)
@@ -19,10 +19,10 @@
 0228-qsortfilterproxymodel-invalidate-noscroll.diff
 0230-qtextcontrol-selectnextword.diff
 0233-fix-q3textbrowser-image.diff
+0235-qdbus-dispatch-async-timeout.diff
+0236-qtoolbararealayout-restore.diff
 
 # debian patches
-0236-qtoolbararealayout-restore.diff
-0235-qdbus-dispatch-async-timeout.diff
 01_qmake_for_debian.diff
 02_launch_assistant-qt4.diff
 03_launch_moc-qt4.diff