rev 9038 - in branches/kde4/packages/kdelibs/debian: . patches

[Adeodato Simó]

Author: adeodato
Date: 2008-01-19 12:46:11 +0000 (Sat, 19 Jan 2008)
New Revision: 9038

Added:
   branches/kde4/packages/kdelibs/debian/patches/r763245_r763431_ktreewidgetsearchlinewidget_delayed_createWidgets.diff
Removed:
   branches/kde4/packages/kdelibs/debian/patches/r763245_ktreewidgetsearchlinewidget_delayed_createWidgets.diff
Modified:
   branches/kde4/packages/kdelibs/debian/changelog
   branches/kde4/packages/kdelibs/debian/patches/series
Log:
Amend r763245_ktreewidgetsearchlinewidget_delayed_createWidgets with r763431.

Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog	2008-01-19 12:38:12 UTC (rev 9037)
+++ branches/kde4/packages/kdelibs/debian/changelog	2008-01-19 12:46:11 UTC (rev 9038)
@@ -7,9 +7,10 @@
     + r759579_kaboutapplicationdialog_crash: do not crash when aboutData is
       NULL in the constructor.
 
-    + r763245_ktreewidgetsearchlinewidget_delayed_createWidgets: do not create
-      the widgets directly in the constructor, but invoke them with a delay,
-      because other way calls to virtual functions does not work correctly.
+    + r763245_r763431_ktreewidgetsearchlinewidget_delayed_createWidgets: do
+      not create the widgets directly in the constructor, but invoke them with
+      a delay, because other way calls to virtual functions does not work
+      correctly.
 
  -- Adeodato Simó <dato at net.com.org.es>  Sat, 19 Jan 2008 10:45:02 +0100
 

Deleted: branches/kde4/packages/kdelibs/debian/patches/r763245_ktreewidgetsearchlinewidget_delayed_createWidgets.diff

Copied: branches/kde4/packages/kdelibs/debian/patches/r763245_r763431_ktreewidgetsearchlinewidget_delayed_createWidgets.diff (from rev 9031, branches/kde4/packages/kdelibs/debian/patches/r763245_ktreewidgetsearchlinewidget_delayed_createWidgets.diff)
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/r763245_r763431_ktreewidgetsearchlinewidget_delayed_createWidgets.diff	                        (rev 0)
+++ branches/kde4/packages/kdelibs/debian/patches/r763245_r763431_ktreewidgetsearchlinewidget_delayed_createWidgets.diff	2008-01-19 12:46:11 UTC (rev 9038)
@@ -0,0 +1,14 @@
+--- a/kdeui/itemviews/ktreewidgetsearchline.cpp
++++ b/kdeui/itemviews/ktreewidgetsearchline.cpp
+@@ -585,8 +585,9 @@
+ {
+   d->treeWidget = treeWidget;
+ 
+-  createWidgets();
+-
++  // can't call createWidgets directly because it calls virtual functions
++  // that might not work if called directly from here due to how inheritance works
++  QMetaObject::invokeMethod(this, "createWidgets", Qt::QueuedConnection);
+ }
+ 
+ KTreeWidgetSearchLineWidget::~KTreeWidgetSearchLineWidget()

Modified: branches/kde4/packages/kdelibs/debian/patches/series
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/series	2008-01-19 12:38:12 UTC (rev 9037)
+++ branches/kde4/packages/kdelibs/debian/patches/series	2008-01-19 12:46:11 UTC (rev 9038)
@@ -8,4 +8,4 @@
 15_kfreebsd_support.diff
 16_arm_fixes.diff
 r759579_kaboutapplicationdialog_crash.diff
-r763245_ktreewidgetsearchlinewidget_delayed_createWidgets.diff
+r763245_r763431_ktreewidgetsearchlinewidget_delayed_createWidgets.diff