diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-11 12:45:59 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-11 12:45:59 +0100 |
| commit | 5ba29e1672dafe16be004409661aef3a7ebf499a (patch) | |
| tree | 245105a3445adc98d53b4de58ed7ce1338539ae2 /src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm | |
| parent | 1df2906c75f379a62bce487d3d2db3ade3095b16 (diff) | |
| parent | 0c5953fd4edbb8e6495aaf288186dbd6737fb8c0 (diff) | |
Merge remote-tracking branch 'origin/5.9.4' into 5.9
Change-Id: Ic23e90146470d69060313628562f76a710696bab
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm b/src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm index dbd7e90dba..9a96895d07 100644 --- a/src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm +++ b/src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm @@ -75,7 +75,7 @@ static QFont qfontForCocoaFont(NSFont *cocoaFont, const QFont &resolveFont) @class QT_MANGLE_NAMESPACE(QNSFontPanelDelegate); -@interface QT_MANGLE_NAMESPACE(QNSFontPanelDelegate) : NSObject<NSWindowDelegate, QT_MANGLE_NAMESPACE(QNSPanelDelegate)> +@interface QT_MANGLE_NAMESPACE(QNSFontPanelDelegate) : NSObject<NSWindowDelegate, QNSPanelDelegate> { @public NSFontPanel *mFontPanel; |