Merge branch 4.7 into qt-4.8-from-4.7

Conflicts:
	doc/src/index.qdoc
	src/xmlpatterns/expr/qevaluationcache_p.h

1 files changed, 0 insertions, 26 deletions

diff --git a/src/gui/kernel/qt_s60_p.h b/src/gui/kernel/qt_s60_p.h
index 3ec4052..ada52a0 100644
--- a/src/gui/kernel/qt_s60_p.h
+++ b/src/gui/kernel/qt_s60_p.h
@@ -97,10 +97,6 @@ static const int qt_symbian_max_screens = 4;
 //this macro exists because EColor16MAP enum value doesn't exist in Symbian OS 9.2
 #define Q_SYMBIAN_ECOLOR16MAP TDisplayMode(13)
 
-class QSymbianTypeFaceExtras;
-typedef QHash<QString, const QSymbianTypeFaceExtras *> QSymbianTypeFaceExtrasHash;
-typedef void (*QThreadLocalReleaseFunc)();
-
 class Q_AUTOTEST_EXPORT QS60ThreadLocalData
 {
 public:
@@ -109,8 +105,6 @@ public:
     bool usingCONEinstances;
     RWsSession wsSession;
     CWsScreenDevice *screenDevice;
-    QSymbianTypeFaceExtrasHash fontData;
-    QVector<QThreadLocalReleaseFunc> releaseFuncs;
 };
 
 class QS60Data
@@ -184,8 +178,6 @@ public:
     inline CWsScreenDevice* screenDevice(const QWidget *widget);
     inline CWsScreenDevice* screenDevice(int screenNumber);
     static inline int screenNumberForWidget(const QWidget *widget);
-    inline QSymbianTypeFaceExtrasHash& fontData();
-    inline void addThreadLocalReleaseFunc(QThreadLocalReleaseFunc func);
     static inline CCoeAppUi* appUi();
     static inline CEikMenuBar* menuBar();
 #ifdef Q_WS_S60
@@ -486,24 +478,6 @@ inline int QS60Data::screenNumberForWidget(const QWidget *widget)
     return qt_widget_private(const_cast<QWidget *>(w))->symbianScreenNumber;
 }
 
-inline QSymbianTypeFaceExtrasHash& QS60Data::fontData()
-{
-    if (!tls.hasLocalData()) {
-        tls.setLocalData(new QS60ThreadLocalData);
-    }
-    return tls.localData()->fontData;
-}
-
-inline void QS60Data::addThreadLocalReleaseFunc(QThreadLocalReleaseFunc func)
-{
-    if (!tls.hasLocalData()) {
-        tls.setLocalData(new QS60ThreadLocalData);
-    }
-    QS60ThreadLocalData *data = tls.localData();
-    if (!data->releaseFuncs.contains(func))
-        data->releaseFuncs.append(func);
-}
-
 inline CCoeAppUi* QS60Data::appUi()
 {
     return CCoeEnv::Static()-> AppUi();