diff options
author | Liang Qi <liang.qi@qt.io> | 2018-10-08 10:56:25 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-10-08 10:56:25 +0200 |
commit | 7344987c20d13710af89300f9b39e06397ec592a (patch) | |
tree | 4c12e46adefd3aee9d2ce479923fe56bab483764 /src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm | |
parent | 8ad5967793f43bda2c38e3f9dddd3d2b6fef5390 (diff) | |
parent | 29208fa07c1b9f656ea2535696828385b7832226 (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/widgets/styles/qstylesheetstyle.cpp
Change-Id: I3a503b44ae413fbc0a90f4af70b8f84daffd86ad
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm')
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm b/src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm index 33b102f3eb..8c0af97a68 100644 --- a/src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm +++ b/src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm @@ -108,8 +108,6 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSFontPanelDelegate); [mFontPanel setRestorable:NO]; [mFontPanel setDelegate:self]; - [NSFontManager sharedFontManager].target = self; // Action is changeFont: - [mFontPanel retain]; } return self; @@ -119,7 +117,6 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSFontPanelDelegate); { [mStolenContentView release]; [mFontPanel setDelegate:nil]; - [NSFontManager sharedFontManager].target = nil; [[NSNotificationCenter defaultCenter] removeObserver:self]; [super dealloc]; @@ -224,6 +221,13 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSFontPanelDelegate); return (mResultCode == NSModalResponseOK); } +// Future proofing in case _NSTargetForSendAction checks this +// property before sending us the changeFont: message. +- (BOOL)worksWhenModal +{ + return YES; +} + - (QPlatformDialogHelper::DialogCode)dialogResultCode { return (mResultCode == NSModalResponseOK) ? QPlatformDialogHelper::Accepted : QPlatformDialogHelper::Rejected; |