diff options
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qfont.cpp | 2 | ||||
| -rw-r--r-- | src/gui/text/qfontdatabase.cpp | 8 | ||||
| -rw-r--r-- | src/gui/text/qrawfont.cpp | 2 | ||||
| -rw-r--r-- | src/gui/text/text.pri | 20 |
4 files changed, 2 insertions, 30 deletions
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index b747739ad0..eec6e6a86e 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -692,7 +692,7 @@ QFont::QFont() If \a pointSize is zero or negative, the point size of the font is set to a system-dependent default value. Generally, this is - 12 points, except on Symbian where it is 7 points. + 12 points. The \a family name may optionally also include a foundry name, e.g. "Helvetica [Cronyx]". If the \a family is diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index 7927f5a941..2ef6c00078 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -556,10 +556,6 @@ public: HANDLE handle; bool memoryFont; QVector<FONTSIGNATURE> signatures; -#elif defined(Q_OS_SYMBIAN) - QString temporaryFileName; - TInt screenDeviceFontFileId; - TUid fontStoreFontFileUid; #endif QStringList families; }; @@ -2197,8 +2193,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 +2223,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) diff --git a/src/gui/text/qrawfont.cpp b/src/gui/text/qrawfont.cpp index d5b85131af..15d0d0ce20 100644 --- a/src/gui/text/qrawfont.cpp +++ b/src/gui/text/qrawfont.cpp @@ -81,7 +81,7 @@ QT_BEGIN_NAMESPACE also have accessors to some relevant data in the physical font. QRawFont only provides support for the main font technologies: GDI and DirectWrite on Windows - platforms, FreeType on Symbian and Linux platforms and CoreText on Mac OS X. For other + platforms, FreeType on Linux platforms and CoreText on Mac OS X. For other font back-ends, the APIs will be disabled. QRawFont can be constructed in a number of ways: diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri index c6bdfbd9c2..a5135cbd85 100644 --- a/src/gui/text/text.pri +++ b/src/gui/text/text.pri @@ -107,25 +107,5 @@ SOURCES += \ HEADERS += \ text/qplatformfontdatabase_qpa.h -symbian { - SOURCES += \ - text/qfont_s60.cpp - contains(QT_CONFIG, freetype) { - SOURCES += \ - text/qfontengine_ft.cpp \ - text/qrawfont_ft.cpp - HEADERS += \ - text/qfontengine_ft_p.h - DEFINES += \ - QT_NO_FONTCONFIG - } else { - SOURCES += \ - text/qfontengine_s60.cpp - HEADERS += \ - text/qfontengine_s60_p.h - } - LIBS += -lfntstr -lecom -} - DEFINES += QT_NO_OPENTYPE INCLUDEPATH += ../3rdparty/harfbuzz/src |