From 614b9efcf5a1d36994245fb1173ab010d16cd702 Mon Sep 17 00:00:00 2001
From: Pierre Rossi <pierre.rossi@nokia.com>
Date: Wed, 5 Oct 2011 17:10:28 +0200
Subject: Fix QFont::defaultFamily() in the new QPA world.

This is so that the results of LayoutTests in WebKit are
more in line with what things were like in Qt 4.8.

Change-Id: I25962e03bd8e0316cb303c0d94c25ac4e73ea9a8
Reviewed-on: http://codereview.qt-project.org/6162
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
---
 src/gui/text/qfontdatabase.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/gui/text/qfontdatabase.h')

diff --git a/src/gui/text/qfontdatabase.h b/src/gui/text/qfontdatabase.h
index 994a7a4a7d..fb8ef20d6d 100644
--- a/src/gui/text/qfontdatabase.h
+++ b/src/gui/text/qfontdatabase.h
@@ -46,6 +46,8 @@
 #include <QtCore/qstring.h>
 #include <QtGui/qfont.h>
 
+class tst_QFont;
+
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -167,6 +169,9 @@ private:
     friend class QFontEngineMultiQWS;
     friend class QFontEngineMultiS60;
     friend class QFontEngineMultiQPA;
+#ifdef QT_BUILD_INTERNAL
+    friend class ::tst_QFont;
+#endif
 
     QFontDatabasePrivate *d;
 };
-- 
cgit v1.2.3