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

Qt: set again immediate widget creation to darwin too, problem was with FOwnWidget which should be false anyway

Browse Source 
when QMenuBar is constructed with known parent (form in this case), so qt will destroy it.

git-svn-id: trunk@34189 -
This commit is contained in:
zeljko 2011-12-14 17:56:50 +00:00
parent eb373f3a6a
commit e4f9a6fa22
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lcl/interfaces/qt/qtwidgets.pas
View File

@ -12733,6 +12733,7 @@ constructor TQtMenuBar.Create(const AParent: QWidgetH);
begin
Create;
Widget := QMenuBar_create(AParent);
FOwnWidget := AParent = nil;
FWidgetDefaultFont := TQtFont.Create(QWidget_font(Widget));
FWidgetLCLFont := nil;
FHeight := getHeight;

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

@ -158,7 +158,7 @@ begin
{$endif}
// Creates the window
{$IFDEF HASX11}
{$IFDEF UNIX}
if (QtVersionMajor = 4) and (QtVersionMinor >= 6) then
QCoreApplication_setAttribute(QtAA_ImmediateWidgetCreation, True);
{$ENDIF}
@ -201,7 +201,7 @@ begin
QtMainWindow.setPopupParent(AForm.PopupMode, PopupParent);
end;
{$IFDEF HASX11}
{$IFDEF UNIX}
if (QtVersionMajor = 4) and (QtVersionMinor >= 6) then
QCoreApplication_setAttribute(QtAA_ImmediateWidgetCreation, False);
{$ENDIF}