diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-02 16:03:43 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-02 16:03:43 (GMT) |
| commit | e8b18a1e0b78fab0a771b73cc5e005207324e6ee (patch) | |
| tree | 2ff1ed00675f9f104da0c0e74c43f16d6a7915a9 /src | |
| parent | 29a5089b83b1b43ecf2c746dac8cadbbe4385553 (diff) | |
| parent | 08d4a7ba40be36d8d8ae63b3bbaeb7823441c8aa (diff) | |
| download | Qt-e8b18a1e0b78fab0a771b73cc5e005207324e6ee.zip Qt-e8b18a1e0b78fab0a771b73cc5e005207324e6ee.tar.gz Qt-e8b18a1e0b78fab0a771b73cc5e005207324e6ee.tar.bz2 | |
Merge branch 4.7 into qt-4.8-from-4.7
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/text/qfontdatabase_s60.cpp | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/src/gui/text/qfontdatabase_s60.cpp b/src/gui/text/qfontdatabase_s60.cpp index ed336d9..cf96733 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; } |