From 367e468dc68c7924be86118df49f33d96380a5b7 Mon Sep 17 00:00:00 2001
From: Thierry Bastian <thierry.bastian@nokia.com>
Date: Wed, 25 Mar 2009 14:11:27 +0100
Subject: Fix a possible crash in QMainWindow when dragging a dock widget.

Even when not animated, we need to set the plugging widget when
plugging. This avoids a hover to be triggered in the middle of the
operation.

Task-number: 248069
Reviewed-by: ogoffart
---
 src/gui/widgets/qmainwindowlayout.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gui/widgets/qmainwindowlayout.cpp b/src/gui/widgets/qmainwindowlayout.cpp
index 768446e..eade633 100644
--- a/src/gui/widgets/qmainwindowlayout.cpp
+++ b/src/gui/widgets/qmainwindowlayout.cpp
@@ -1542,8 +1542,8 @@ bool QMainWindowLayout::plug(QLayoutItem *widgetItem)
     if (!previousPath.isEmpty())
         layoutState.remove(previousPath);
 
+    pluggingWidget = widget;
     if (dockOptions & QMainWindow::AnimatedDocks) {
-        pluggingWidget = widget;
         QRect globalRect = currentGapRect;
         globalRect.moveTopLeft(parentWidget()->mapToGlobal(globalRect.topLeft()));
 #ifndef QT_NO_DOCKWIDGET
@@ -1575,6 +1575,7 @@ bool QMainWindowLayout::plug(QLayoutItem *widgetItem)
 #endif
         currentGapPos.clear();
         updateGapIndicator();
+        pluggingWidget = 0;
     }
 
     return true;
-- 
cgit v0.12