diff options
| author | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2010-03-02 10:33:55 (GMT) |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2010-03-05 14:17:49 (GMT) |
| commit | 0cb155516992d3bb917f72bdab9f28b9e65ff40d (patch) | |
| tree | 3e4eb733e05a23bfb17a8ff4454e651d3f70ff32 /src/gui/dialogs/qfontdialog_p.h | |
| parent | f6c2f53e0c5485817b1f9895f69fa0ad75519977 (diff) | |
| download | Qt-0cb155516992d3bb917f72bdab9f28b9e65ff40d.zip Qt-0cb155516992d3bb917f72bdab9f28b9e65ff40d.tar.gz Qt-0cb155516992d3bb917f72bdab9f28b9e65ff40d.tar.bz2 | |
Mac: static getFont functions in QFontDialog does not work
This bug is visible if the static funtions are used before
calling qApp->exec().
The reason is that the static functions still use the old
code path, rather than the new one (that will end up creating
a QFontDialog and call exec on it). Just using the new style
will fix the problem.
Task-number: QTBUG-7371
Reviewed-by: cduclos
Diffstat (limited to 'src/gui/dialogs/qfontdialog_p.h')
| -rw-r--r-- | src/gui/dialogs/qfontdialog_p.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/gui/dialogs/qfontdialog_p.h b/src/gui/dialogs/qfontdialog_p.h index 7654a80..c18b87b 100644 --- a/src/gui/dialogs/qfontdialog_p.h +++ b/src/gui/dialogs/qfontdialog_p.h @@ -139,13 +139,7 @@ public: QByteArray memberToDisconnectOnClose; #ifdef Q_WS_MAC - static void *openCocoaFontPanel(const QFont &initial, - QWidget *parent, const QString &title, - QFontDialog::FontDialogOptions options, - QFontDialogPrivate *priv = 0); static void closeCocoaFontPanel(void *delegate); - static QFont execCocoaFontPanel(bool *ok, const QFont &initial, QWidget *parent, - const QString &title, QFontDialog::FontDialogOptions options); static void setFont(void *delegate, const QFont &font); inline void done(int result) { q_func()->done(result); } |