From 87d90e960c76f7b29a590e918bdcbeb2b9dfa43b Mon Sep 17 00:00:00 2001
From: zeljko <zeljko@lazarus-ide.org>
Date: Sun, 13 Oct 2013 09:42:52 +0000
Subject: [PATCH] Qt: fixed crash when QTSCROLLABLEFORMS are enabled and
 reparenting form with mouse (eg undock).part of issue #24715

git-svn-id: trunk@43234 -
---
 lcl/interfaces/qt/qtwidgets.pas | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/lcl/interfaces/qt/qtwidgets.pas b/lcl/interfaces/qt/qtwidgets.pas
index 799056654d..b4cd39d6fa 100644
--- a/lcl/interfaces/qt/qtwidgets.pas
+++ b/lcl/interfaces/qt/qtwidgets.pas
@@ -6025,9 +6025,9 @@ begin
   Result := False;
   if (LCLObject = nil) then
     exit;
-  if (QEvent_Type(Event) in [QEventMouseButtonPress, QEventMouseButtonRelease, QEventMouseButtonDblClick,
-    QEventMouseMove, QEventWheel, QEventPaint, QEventHoverEnter, QEventHoverMove,
-      QEventHoverLeave, QEventResize]) then
+  if (QEvent_Type(Event) in [QEventMouseButtonPress, QEventMouseButtonRelease,
+    QEventMouseButtonDblClick, QEventMouseMove, QEventWheel, QEventPaint,
+    QEventHoverEnter, QEventHoverMove, QEventHoverLeave, QEventResize]) then
     exit;
   Result := inherited EventFilter(Sender, Event);
 end;
@@ -6042,9 +6042,8 @@ begin
   if LCLObject = nil then
     exit;
   BeginEventProcessing;
-  if (QEvent_Type(Event) in [QEventMouseButtonPress, QEventMouseButtonRelease, QEventMouseButtonDblClick,
-    QEventMouseMove, QEventWheel, QEventPaint, QEventHoverEnter, QEventHoverMove,
-      QEventHoverLeave]) then
+  if (QEvent_Type(Event) in [QEventContextMenu, QEventPaint, QEventHoverEnter,
+                             QEventHoverMove, QEventHoverLeave]) then
   begin
     Result := inherited EventFilter(Sender, Event);
   end else
@@ -6531,8 +6530,7 @@ begin
   {$IFDEF QTSCROLLABLEFORMS}
   if Assigned(ScrollArea) and not IsMDIChild then
   begin
-    if QEvent_type(Event) in [QEventMouseButtonPress, QEventMouseButtonRelease,
-                              QEventMouseButtonDblClick, QEventPaint,
+    if QEvent_type(Event) in [QEventPaint,
                               QEventContextMenu] then
       exit;
   end;