diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-12-15 17:08:12 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-12-15 17:08:12 (GMT) |
| commit | 8e504f4709d15f502ca097f6bf4b27880fd9c6c5 (patch) | |
| tree | 19e49e1271be2b9a41e31f3a9d241ccb70da88b5 /src/gui/dialogs/qfontdialog_mac.mm | |
| parent | 4896b8a5b16c7f91e026e52906c063af204c34be (diff) | |
| parent | 1bbb6e4db246d7be69a7592e2e700f79d7858d5a (diff) | |
| download | Qt-8e504f4709d15f502ca097f6bf4b27880fd9c6c5.zip Qt-8e504f4709d15f502ca097f6bf4b27880fd9c6c5.tar.gz Qt-8e504f4709d15f502ca097f6bf4b27880fd9c6c5.tar.bz2 | |
Merge branch '4.5' into 4.6-staging
Conflicts:
mkspecs/macx-g++40/qplatformdefs.h
Diffstat (limited to 'src/gui/dialogs/qfontdialog_mac.mm')
| -rw-r--r-- | src/gui/dialogs/qfontdialog_mac.mm | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/dialogs/qfontdialog_mac.mm b/src/gui/dialogs/qfontdialog_mac.mm index 0c467cd..31bab2b 100644 --- a/src/gui/dialogs/qfontdialog_mac.mm +++ b/src/gui/dialogs/qfontdialog_mac.mm @@ -394,7 +394,9 @@ static QFont qfontForCocoaFont(NSFont *cocoaFont, const QFont &resolveFont) } [mFontPanel setDelegate:nil]; [[NSFontManager sharedFontManager] setDelegate:nil]; +#ifdef QT_MAC_USE_COCOA [[NSFontManager sharedFontManager] setTarget:nil]; +#endif } @end @@ -518,7 +520,9 @@ void *QFontDialogPrivate::openCocoaFontPanel(const QFont &initial, extraHeight:dialogExtraHeight]; [ourPanel setDelegate:delegate]; [[NSFontManager sharedFontManager] setDelegate:delegate]; +#ifdef QT_MAC_USE_COCOA [[NSFontManager sharedFontManager] setTarget:delegate]; +#endif setFont(delegate, initial); // hack to get correct initial layout |