diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-13 20:42:10 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-13 20:42:10 (GMT) |
| commit | a82ac93ee26a2d74264578304aa4cd01aad2ccaa (patch) | |
| tree | 15d7ca6cc7f20116876473b8063abcfcbead244c /src | |
| parent | 89164d1e312ff44eb279cf18d7c4404499555d1b (diff) | |
| download | Qt-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')
| -rw-r--r-- | src/gui/text/qfontdatabase_s60.cpp | 6 | ||||
| -rw-r--r-- | src/gui/text/qfontengine_s60.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/text/qfontdatabase_s60.cpp b/src/gui/text/qfontdatabase_s60.cpp index 9999159..cdfba3d 100644 --- a/src/gui/text/qfontdatabase_s60.cpp +++ b/src/gui/text/qfontdatabase_s60.cpp @@ -118,7 +118,7 @@ public: { if (!font) return; - QS60Data::screenDevice()->ReleaseFont(font); + S60->screenDevice()->ReleaseFont(font); } }; @@ -205,7 +205,7 @@ const QSymbianTypeFaceExtras *QSymbianFontDatabaseExtrasImplementation::extras(c CFont* font = NULL; #ifdef Q_SYMBIAN_HAS_FONTTABLE_API - const TInt err = QS60Data::screenDevice()->GetNearestFontToDesignHeightInPixels(font, searchSpec); + const TInt err = S60->screenDevice()->GetNearestFontToDesignHeightInPixels(font, searchSpec); Q_ASSERT(err == KErrNone && font); QScopedPointer<CFont, CFontFromScreenDeviceReleaser> sFont(font); QSymbianTypeFaceExtras *extras = new QSymbianTypeFaceExtras(font); @@ -311,7 +311,7 @@ static void initializeDb() QSymbianFbsHeapLock lock(QSymbianFbsHeapLock::Unlock); - const int numTypeFaces = QS60Data::screenDevice()->NumTypefaces(); + const int numTypeFaces = S60->screenDevice()->NumTypefaces(); const QSymbianFontDatabaseExtrasImplementation *dbExtras = static_cast<const QSymbianFontDatabaseExtrasImplementation*>(db->symbianExtras); bool fontAdded = false; 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 |