diff options
| author | Carlos Manuel Duclos Vergara <carlos.duclos@nokia.com> | 2010-02-22 13:58:41 (GMT) |
|---|---|---|
| committer | Carlos Manuel Duclos Vergara <carlos.duclos@nokia.com> | 2010-02-22 14:01:48 (GMT) |
| commit | 976a2b6ad1f95175d8d0be2d1eb7603cf4e4026a (patch) | |
| tree | d8413137eb7f1307c2a15c6eb9d2e253ba59a681 /src/gui/dialogs/qfontdialog_p.h | |
| parent | 5e95e1bb510d24b9b7889191144a4842fd8569c1 (diff) | |
| download | Qt-976a2b6ad1f95175d8d0be2d1eb7603cf4e4026a.zip Qt-976a2b6ad1f95175d8d0be2d1eb7603cf4e4026a.tar.gz Qt-976a2b6ad1f95175d8d0be2d1eb7603cf4e4026a.tar.bz2 | |
QFontDialog::exec() never returns on OSX
The problem is the fact that this dialog is never meant to be used this
way. Instead it should be called through the static function ::getFont(...).
I reimplemented this code path and made sure that this works.
Task-number: QTBUG-7769
Reviewed-by: Richard Moe Gustavsen
Diffstat (limited to 'src/gui/dialogs/qfontdialog_p.h')
| -rw-r--r-- | src/gui/dialogs/qfontdialog_p.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/dialogs/qfontdialog_p.h b/src/gui/dialogs/qfontdialog_p.h index ca2b10b..7654a80 100644 --- a/src/gui/dialogs/qfontdialog_p.h +++ b/src/gui/dialogs/qfontdialog_p.h @@ -152,6 +152,12 @@ public: inline QFontDialog *fontDialog() { return q_func(); } void *delegate; + bool nativeDialogInUse; + bool canBeNativeDialog(); + bool setVisible_sys(bool visible); + void *_q_constructNativePanel(); + void _q_macRunNativeAppModalPanel(); + void mac_nativeDialogModalHelp(); static bool sharedFontPanelAvailable; #endif |