1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

macOS: Forward application{Will,Did}FinishLaunching to reflection delegate

Browse Source 
If a custom application delegate is installed prior to creating the
Qt application delegate we will forward callbacks to the delegate,
but this has to be done manually for any callback we implement.

Fixes: QTBUG-122996
Pick-to: 6.6 6.5
Change-Id: Ia25e2c4b8cac37130d604c772c875c5d76c66764
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
(cherry picked from commit d8371ebbd2b405bb1361836523a2b15a54780607)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Tor Arne Vestbø 2024-03-05 13:52:40 +01:00 committed by Qt Cherry-pick Bot
parent 8a8481f7eb
commit cbdd820398
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
View File

@ -148,7 +148,8 @@ QT_USE_NAMESPACE
- (void)applicationWillFinishLaunching:(NSNotification *)notification
{
Q_UNUSED(notification);
if ([reflectionDelegate respondsToSelector:_cmd])
[reflectionDelegate applicationWillFinishLaunching:notification];
/*
From the Cocoa documentation: "A good place to install event handlers
@ -185,7 +186,9 @@ QT_USE_NAMESPACE
- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
{
Q_UNUSED(aNotification);
if ([reflectionDelegate respondsToSelector:_cmd])
[reflectionDelegate applicationDidFinishLaunching:aNotification];
inLaunch = false;
if (qEnvironmentVariableIsEmpty("QT_MAC_DISABLE_FOREGROUND_APPLICATION_TRANSFORM")) {