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

[Fathi Boudra]

Author: fboudra-guest
Date: 2007-11-07 16:23:59 +0000 (Wed, 07 Nov 2007)
New Revision: 7817

Modified:
   trunk/packages/qt4-x11/debian/patches/0196-q3toolbar-clean-rebuild.diff
Log:
* Update qt3toolbar patch.


Modified: trunk/packages/qt4-x11/debian/patches/0196-q3toolbar-clean-rebuild.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0196-q3toolbar-clean-rebuild.diff	2007-11-06 19:06:08 UTC (rev 7816)
+++ trunk/packages/qt4-x11/debian/patches/0196-q3toolbar-clean-rebuild.diff	2007-11-07 16:23:59 UTC (rev 7817)
@@ -27,3 +27,12 @@
              if (isVisible()) {
                  // toolbar compatibility: we auto show widgets that
                  // are not explicitly hidden
+@@ -551,6 +551,8 @@
+ void Q3ToolBar::clear()
+ {
+     QObjectList childList = children();
++    d->extension = 0;
++    d->extensionPopup = 0; //they will both be destroyed by the following code
+     for (int i = 0; i < childList.size(); ++i) {
+         QObject *obj = childList.at(i);
+         if (obj->isWidgetType() && QLatin1String("qt_dockwidget_internal") != obj->objectName())