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

Qt: fixed forms in library (dll) crashing.

Browse Source 
git-svn-id: trunk@34642 -
This commit is contained in:
zeljko 2012-01-07 17:22:02 +00:00
parent a6a384a0e7
commit a77f6d8a5e
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lcl/interfaces/qt/qtint.pp
View File

@ -57,6 +57,7 @@ type
TQtWidgetSet = Class(TWidgetSet)
private
App: QApplicationH;
FIsLibraryInstance: Boolean;
// cache for WindowFromPoint
FLastWFPMousePos: TPoint;
@ -185,6 +186,10 @@ type
procedure FreeSysColorBrushes(const AInvalidateHandlesOnly: Boolean = False);
property DragImageLock: Boolean read FDragImageLock write FDragImageLock;
{do not create new QApplication object if we are called from library }
property IsLibraryInstance: Boolean read FIsLibraryInstance;
property OverrideCursor: TObject read FOverrideCursor write SetOverrideCursor;
{$IFDEF HASX11}
property WindowManagerName: String read FWindowManagerName;

27
lcl/interfaces/qt/qtobject.inc
View File

@ -80,11 +80,18 @@ begin
FLastWFPResult := 0;
inherited Create;
App := QApplication_Create(@argc, argv);
FIsLibraryInstance := QCoreApplication_instance() <> nil;
if FIsLibraryInstance then
App := QApplicationH(QCoreApplication_instance())
else
App := QApplication_Create(@argc, argv);
{$J+}
QtVersionInt(QtVersionMajor, QtVersionMinor, QtVersionMicro);
{$J-}
FAppEvenFilterHook := nil;
FAppFocusChangedHook := nil;
QtGDIObjects := TQtGDIObjects.Create;
InitStockItems;
QtWidgetSet := Self;
@ -99,13 +106,14 @@ begin
{$IFDEF HASX11}
FMinimizedByPager := False;
FLastMinimizeEvent := 0;
if ((QtVersionMajor = 4) and (QtVersionMinor < 6)) or IsOldKDEInstallation then
QtX11InitializePalettes;
if not FIsLibraryInstance and
((QtVersionMajor = 4) and (QtVersionMinor < 6)) or IsOldKDEInstallation then
QtX11InitializePalettes;
FWindowManagerName := LowerCase(GetWindowManager);
{$ENDIF}
{$IFDEF DARWIN}
// do not swap meta and ctrl keys, issue #20897
if (QtVersionMajor = 4) and (QtVersionMinor > 5) then
if not FIsLibraryInstance then (QtVersionMajor = 4) and (QtVersionMinor > 5) then
QCoreApplication_setAttribute(QtAA_MacDontSwapCtrlAndMeta, True);
{$ENDIF}
FGlobalActions := TFPList.Create;
@ -209,8 +217,8 @@ begin
// install global event filter
FAppEvenFilterHook := QObject_hook_create(App);
QObject_hook_hook_events(FAppEvenFilterHook, @EventFilter);
// install focus change slot
// install focus change slot
FAppFocusChangedHook := QApplication_hook_create(App);
QApplication_hook_hook_focusChanged(FAppFocusChangedHook, @FocusChanged);
@ -289,8 +297,9 @@ begin
// free hooks
QObject_hook_destroy(FAppEvenFilterHook);
QApplication_hook_destroy(FAppFocusChangedHook);
QCoreApplication_quit;
// do not quit application if we are library
if not FIsLibraryInstance then
QCoreApplication_quit;
end;
procedure TQtWidgetSet.AppMinimize;