diff options
| author | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-04-26 13:35:51 (GMT) |
|---|---|---|
| committer | Timo Turunen <timo.p.turunen@nokia.com> | 2011-08-30 07:02:12 (GMT) |
| commit | 636edb74bc3228e4819a605db19399dd277d7ad8 (patch) | |
| tree | 2647bea80bdf985975957cb4ec213ca2cd2a74a0 /src/gui/kernel/qapplication_s60.cpp | |
| parent | 6b6e0c404e1e1ee4706248a1b2f23f284ed1bc42 (diff) | |
| download | Qt-636edb74bc3228e4819a605db19399dd277d7ad8.zip Qt-636edb74bc3228e4819a605db19399dd277d7ad8.tar.gz Qt-636edb74bc3228e4819a605db19399dd277d7ad8.tar.bz2 | |
Make text rendering working outside the gui thread on Symbian.
It was previously not possible to render text (QPainter::drawText)
in a secondary thread on Symbian, it always resulted in some
kind of panic. This patch corrects it. For S60 5.0 and earlier
the behavior is not changed, threaded text rendering is only
supported on Symbian^3 and newer. This also means
QFontDatabase::supportsThreadedFontRendering() will return
true from now on, but only on Symbian^3 and higher.
Task-number: QTBUG-18516
Reviewed-by: mread
(cherry picked from commit 0c62e02b80570bf8b92eff7acceb9018df61c89e)
(cherry picked from commit 13e7d402c438fd2c527dbc302cf1103d5c835a2f)
Reapplied after bad v4.7.4 merge
Diffstat (limited to 'src/gui/kernel/qapplication_s60.cpp')
| -rw-r--r-- | src/gui/kernel/qapplication_s60.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index b98bdbc..a53d273 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -2723,6 +2723,9 @@ QS60ThreadLocalData::QS60ThreadLocalData() QS60ThreadLocalData::~QS60ThreadLocalData() { + for (int i = 0; i < releaseFuncs.count(); ++i) + releaseFuncs[i](); + releaseFuncs.clear(); if (!usingCONEinstances) { delete screenDevice; wsSession.Close(); |