diff options
Diffstat (limited to 'src/gui/text/qfontdatabase.cpp')
-rw-r--r-- | src/gui/text/qfontdatabase.cpp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index e7cbe2a8a8..3ef28b8e50 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -1,8 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the QtGui module of the Qt Toolkit. ** @@ -35,6 +34,7 @@ ** ** ** +** ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -552,15 +552,6 @@ public: struct ApplicationFont { QString fileName; QByteArray data; -#if defined(Q_OS_WIN) - HANDLE handle; - bool memoryFont; - QVector<FONTSIGNATURE> signatures; -#elif defined(Q_OS_SYMBIAN) - QString temporaryFileName; - TInt screenDeviceFontFileId; - TUid fontStoreFontFileUid; -#endif QStringList families; }; QVector<ApplicationFont> applicationFonts; @@ -2197,8 +2188,6 @@ bool QFontDatabasePrivate::isApplicationFont(const QString &fileName) \note Adding application fonts on Unix/X11 platforms without fontconfig is currently not supported. - \note On Symbian, the font family names get truncated to a length of 20 characters. - \sa addApplicationFontFromData(), applicationFontFamilies(), removeApplicationFont() */ int QFontDatabase::addApplicationFont(const QString &fileName) @@ -2229,8 +2218,6 @@ int QFontDatabase::addApplicationFont(const QString &fileName) \bold{Note:} Adding application fonts on Unix/X11 platforms without fontconfig is currently not supported. - \note On Symbian, the font family names get truncated to a length of 20 characters. - \sa addApplicationFont(), applicationFontFamilies(), removeApplicationFont() */ int QFontDatabase::addApplicationFontFromData(const QByteArray &fontData) |