summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfontdatabase_s60.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/text/qfontdatabase_s60.cpp')
-rw-r--r--src/gui/text/qfontdatabase_s60.cpp23
1 files changed, 2 insertions, 21 deletions
diff --git a/src/gui/text/qfontdatabase_s60.cpp b/src/gui/text/qfontdatabase_s60.cpp
index ffecca7..f29c880 100644
--- a/src/gui/text/qfontdatabase_s60.cpp
+++ b/src/gui/text/qfontdatabase_s60.cpp
@@ -62,33 +62,14 @@
#define SYMBIAN_LINKEDFONTS_SUPPORTED
#endif // !SYMBIAN_VERSION_9_4
-#ifdef SYMBIAN_LINKEDFONTS_SUPPORTED
-#include <linkedfonts.h>
-#endif // SYMBIAN_LINKEDFONTS_SUPPORTED
-
QT_BEGIN_NAMESPACE
-#ifdef SYMBIAN_LINKEDFONTS_SUPPORTED
-static bool isLinkedFontL(const TDesC &aTypefaceName)
-{
- CLinkedTypefaceSpecification *linkedspec = CLinkedTypefaceSpecification::NewLC(aTypefaceName);
- CFbsTypefaceStore *tfs = CFbsTypefaceStore::NewL(NULL);
- CleanupStack::PushL(tfs);
- linkedspec->FetchLinkedTypefaceSpecificationL(*tfs);
- CleanupStack::PopAndDestroy(tfs);
- CleanupStack::PopAndDestroy(linkedspec);
- return true;
-}
-#endif // SYMBIAN_LINKEDFONTS_SUPPORTED
-
bool qt_symbian_isLinkedFont(const TDesC &typefaceName) // Also used in qfont_s60.cpp
{
bool isLinkedFont = false;
#ifdef SYMBIAN_LINKEDFONTS_SUPPORTED
- if (RFbsSession::Connect() == KErrNone) {
- TRAP_IGNORE(isLinkedFont = isLinkedFontL(typefaceName));
- RFbsSession::Disconnect();
- }
+ const QString name((const QChar*)typefaceName.Ptr(), typefaceName.Length());
+ isLinkedFont = name.endsWith(QLatin1String("LF")) && name == name.toUpper();
#endif // SYMBIAN_LINKEDFONTS_SUPPORTED
return isLinkedFont;
}