paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-06 05:02:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Qt,Qt5: fixed application hang when terminated but trying to show another form. Now we do not use QtUseNativeEventLoop on qt4 anymore. Issue #34982

Browse Source 
git-svn-id: branches/fixes_2_0@60288 -
This commit is contained in:
mattias 2019-02-02 18:44:41 +00:00
parent ef32e7493c
commit 7e5b882e03
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lcl/interfaces/qt/qtdefines.inc
View File

@ -9,7 +9,8 @@
{$DEFINE QTCOCOA}
{$ENDIF}
{$DEFINE QTSCROLLABLEFORMS}
{$DEFINE QtUseNativeEventLoop}
{removed usage of nativeeventloop because of issue #34982}
{.$DEFINE QtUseNativeEventLoop}
{$IFDEF DARWIN}
{enable this define if you have problems when dialogs are shown behind application}
{.$DEFINE TQTMESSAGEBOXUSEPARENT}

6
lcl/interfaces/qt/qtwsforms.pp
View File

@ -474,6 +474,12 @@ begin
ACustomForm := TCustomForm(AWinControl);
Widget := TQtMainWindow(AWinControl.Handle);
{$IFNDEF QtUseNativeEventLoop}
{issue #34982}
if AWinControl.HandleObjectShouldBeVisible and Application.Terminated then
exit;
{$ENDIF}
if AWinControl.HandleObjectShouldBeVisible then
begin
if fsModal in ACustomForm.FormState then

7
lcl/interfaces/qt5/qtwsforms.pp
View File

@ -479,6 +479,13 @@ begin
Widget := TQtMainWindow(AWinControl.Handle);
{$IFNDEF QtUseNativeEventLoop}
{issue #34982}
if AWinControl.HandleObjectShouldBeVisible and Application.Terminated then
exit;
{$ENDIF}
if AWinControl.HandleObjectShouldBeVisible then
begin
if fsModal in TForm(AWinControl).FormState then