1 files changed, 11 insertions, 10 deletions

diff --git a/src/gui/text/qfontdatabase.h b/src/gui/text/qfontdatabase.h
index d7d8745f12..6d738d96be 100644
--- a/src/gui/text/qfontdatabase.h
+++ b/src/gui/text/qfontdatabase.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
@@ -10,9 +10,9 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,8 +23,8 @@
 ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** $QT_END_LICENSE$
@@ -51,8 +51,6 @@ class QFontDatabasePrivate;
 class Q_GUI_EXPORT QFontDatabase
 {
     Q_GADGET
-    Q_ENUMS(WritingSystem)
-    Q_ENUMS(SystemFont)
 public:
     // do not re-order or delete entries from this enum without updating the
     // QPF2 format and makeqpf!!
@@ -98,6 +96,7 @@ public:
 
         WritingSystemsCount
     };
+    Q_ENUM(WritingSystem)
 
     enum SystemFont {
         GeneralFont,
@@ -105,6 +104,7 @@ public:
         TitleFont,
         SmallestReadableFont
     };
+    Q_ENUM(SystemFont)
 
     static QList<int> standardSizes();
 
@@ -132,6 +132,7 @@ public:
     int weight(const QString &family, const QString &style) const;
 
     bool hasFamily(const QString &family) const;
+    bool isPrivateFamily(const QString &family) const;
 
     static QString writingSystemName(WritingSystem writingSystem);
     static QString writingSystemSample(WritingSystem writingSystem);
@@ -159,7 +160,7 @@ private:
     friend class QFontPrivate;
     friend class QFontDialog;
     friend class QFontDialogPrivate;
-    friend class QFontEngineMultiBasicImpl;
+    friend class QFontEngineMulti;
 
     QFontDatabasePrivate *d;
 };