From 0dfb7598e4659dc912c2b3ace7dfdb93f953f83c Mon Sep 17 00:00:00 2001
From: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
Date: Wed, 3 Mar 2010 09:56:36 +0100
Subject: 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
---
 src/gui/dialogs/qfontdialog_mac.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
-- 
cgit v0.12