diff options
| author | Martin Smith <msmith@trolltech.com> | 2009-05-25 12:06:25 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2009-05-25 12:06:25 (GMT) |
| commit | fa341212e574ef5970c4676456763b6b014e44c5 (patch) | |
| tree | 43d0a59fc50adee6c6385a4733f93ed6acf31e49 | |
| parent | 230357435d35a5b379c697723302108dd114585d (diff) | |
| parent | 58253fafc6d3c0a535833e674d8930a46138c25f (diff) | |
| download | Qt-fa341212e574ef5970c4676456763b6b014e44c5.zip Qt-fa341212e574ef5970c4676456763b6b014e44c5.tar.gz Qt-fa341212e574ef5970c4676456763b6b014e44c5.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
| -rw-r--r-- | src/gui/dialogs/qfontdialog.cpp | 8 | ||||
| -rw-r--r-- | src/gui/dialogs/qfontdialog_mac.mm | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/gui/dialogs/qfontdialog.cpp b/src/gui/dialogs/qfontdialog.cpp index 4c5bf4f..aa1c553 100644 --- a/src/gui/dialogs/qfontdialog.cpp +++ b/src/gui/dialogs/qfontdialog.cpp @@ -337,6 +337,14 @@ void QFontDialogPrivate::init() QFontDialog::~QFontDialog() { +#ifdef Q_WS_MAC + Q_D(QFontDialog); + if (d->delegate) { + QFontDialogPrivate::closeCocoaFontPanel(d->delegate); + QFontDialogPrivate::sharedFontPanelAvailable = true; + return; + } +#endif } /*! diff --git a/src/gui/dialogs/qfontdialog_mac.mm b/src/gui/dialogs/qfontdialog_mac.mm index 50917a1..13f7149 100644 --- a/src/gui/dialogs/qfontdialog_mac.mm +++ b/src/gui/dialogs/qfontdialog_mac.mm @@ -566,6 +566,7 @@ void *QFontDialogPrivate::openCocoaFontPanel(const QFont &initial, void QFontDialogPrivate::closeCocoaFontPanel(void *delegate) { + QMacCocoaAutoReleasePool pool; QCocoaFontPanelDelegate *theDelegate = static_cast<QCocoaFontPanelDelegate *>(delegate); NSWindow *ourPanel = [theDelegate actualPanel]; [ourPanel close]; |