diff options
| author | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2010-03-03 08:56:36 (GMT) |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2010-03-05 14:17:50 (GMT) |
| commit | 0dfb7598e4659dc912c2b3ace7dfdb93f953f83c (patch) | |
| tree | b1f1d31b9260a0baaf878642bd169a760b05b2e8 | |
| parent | f3ecbb007acf39b43c73be26f4cbbf195c352e57 (diff) | |
| download | Qt-0dfb7598e4659dc912c2b3ace7dfdb93f953f83c.zip Qt-0dfb7598e4659dc912c2b3ace7dfdb93f953f83c.tar.gz Qt-0dfb7598e4659dc912c2b3ace7dfdb93f953f83c.tar.bz2 | |
Mac: qfontdialog test fails
The native font dialog on mac did not set the font specified in the
non-native font dialog upon exec, but rather qApp->font(). This oneliner
sets the correct font, and makes the autotest pass.
Reviewed-by: cduclos
| -rw-r--r-- | src/gui/dialogs/qfontdialog_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/dialogs/qfontdialog_mac.mm b/src/gui/dialogs/qfontdialog_mac.mm index 3a4c688..fd7fd68 100644 --- a/src/gui/dialogs/qfontdialog_mac.mm +++ b/src/gui/dialogs/qfontdialog_mac.mm @@ -514,7 +514,7 @@ void *QFontDialogPrivate::_q_constructNativePanel() #ifdef QT_MAC_USE_COCOA [[NSFontManager sharedFontManager] setTarget:delegate]; #endif - setFont(delegate, QApplication::font()); + setFont(delegate, q_func()->currentFont()); { // hack to get correct initial layout |