summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfontengine_s60.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2010-06-13 20:42:10 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2010-06-13 20:42:10 (GMT)
commita82ac93ee26a2d74264578304aa4cd01aad2ccaa (patch)
tree15d7ca6cc7f20116876473b8063abcfcbead244c /src/gui/text/qfontengine_s60.cpp
parent89164d1e312ff44eb279cf18d7c4404499555d1b (diff)
downloadQt-a82ac93ee26a2d74264578304aa4cd01aad2ccaa.zip
Qt-a82ac93ee26a2d74264578304aa4cd01aad2ccaa.tar.gz
Qt-a82ac93ee26a2d74264578304aa4cd01aad2ccaa.tar.bz2
Prospective S60 build fix
QS60Data::screenDevice() has moved from being process global to being thread local, therefore it must be accessed through the S60 macro that returns the thread-local data.
Diffstat (limited to 'src/gui/text/qfontengine_s60.cpp')
-rw-r--r--src/gui/text/qfontengine_s60.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_s60.cpp b/src/gui/text/qfontengine_s60.cpp
index 925b3bf..f691413 100644
--- a/src/gui/text/qfontengine_s60.cpp
+++ b/src/gui/text/qfontengine_s60.cpp
@@ -66,7 +66,7 @@ QSymbianTypeFaceExtras::QSymbianTypeFaceExtras(CFont* cFont, COpenFont *openFont
QSymbianTypeFaceExtras::~QSymbianTypeFaceExtras()
{
- QS60Data::screenDevice()->ReleaseFont(m_cFont);
+ S60->screenDevice()->ReleaseFont(m_cFont);
}
QByteArray QSymbianTypeFaceExtras::getSfntTable(uint tag) const