3 files changed, 9 insertions, 21 deletions
diff --git a/mkspecs/common/symbian/symbian-makefile.conf b/mkspecs/common/symbian/symbian-makefile.conf
index a725df3..14acd69 100644
--- a/mkspecs/common/symbian/symbian-makefile.conf
+++ b/mkspecs/common/symbian/symbian-makefile.conf
@@ -34,6 +34,11 @@ QMAKE_ELF2E32_FLAGS	= --dlldata \
                           --compressionmethod bytepair \
                           --unpaged
 
+CONFIG(debug, debug|release) {
+    QMAKE_ELF2E32_FLAGS += \
+                           --debuggable
+}
+
 QMAKE_PREFIX_SHLIB    =
 CONFIG *= no_plugin_name_prefix
 QMAKE_PREFIX_STATICLIB =
diff --git a/mkspecs/common/symbian/symbian-mmp.conf b/mkspecs/common/symbian/symbian-mmp.conf
index 8ed326a..fa2a815 100644
--- a/mkspecs/common/symbian/symbian-mmp.conf
+++ b/mkspecs/common/symbian/symbian-mmp.conf
@@ -58,3 +58,5 @@ symbian-sbsv2 {
     QMAKE_SBSV2_DEL_TREE       = $(GNURM) -rf
 }
 
+# Mark all debug executables debuggable.
+MMP_RULES += DEBUGGABLE_UDEBONLY
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;
 }