diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-10 06:16:20 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-10 06:16:20 +0200 |
| commit | 7084f021bcd3ecc4d4cc4609b4185bcc6dc3a037 (patch) | |
| tree | 07ff4a289f5cba128ec2e2c0cec632f518fee7c2 /src/gui/text | |
| parent | 7690bab57ef7ae6d669c6df23e9de72fd8a85d62 (diff) | |
| parent | 617059a549a85e93cc9ef3130138c84d66871842 (diff) | |
| download | qt4-tools-7084f021bcd3ecc4d4cc4609b4185bcc6dc3a037.tar.gz | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix build error in QtGui armv5 udeb
Updated qtbench to build against modified QStaticText API
Make compiling / linking a non-qt app work too on symbian/gcce
When on Symbian use smaller files.
Fixing the missing "\\"
The cmd line arguments have not been delegated properly.
Clear QFontCache TLS content before nullifying TLS pointer.
Add --download option to runonphone
Implement download support to TRK Launcher
Fix library creation on symbian/gcce
Update Symbian def files for 4.7
Various fixes for symbian/gcce building.
Make encoding clear
Fix 'make sis' working on symbian makefile based system again.
Make shipped symbian scripts available from the build-dir bin dir.
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qfont.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index 99b9f40cc2..cb16a16b1c 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -2614,8 +2614,10 @@ void QFontCache::cleanup() } QT_CATCH (const std::bad_alloc &) { // no cache - just ignore } - if (cache && cache->hasLocalData()) + if (cache && cache->hasLocalData()) { + cache->localData()->clear(); cache->setLocalData(0); + } } #endif // QT_NO_THREAD |