summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2010-04-10 22:59:07 (GMT)
committerLars Knoll <lars.knoll@nokia.com>2010-04-10 23:18:18 (GMT)
commitd5d013b46ef2ea51172d364e8b32a82cb216056a (patch)
treec66e846b2e63b19448e094dbc2fab46b4c409d7b
parent698c7a45d156e9f85afb870ffcd5b99d08d8677b (diff)
downloadQt-d5d013b46ef2ea51172d364e8b32a82cb216056a.zip
Qt-d5d013b46ef2ea51172d364e8b32a82cb216056a.tar.gz
Qt-d5d013b46ef2ea51172d364e8b32a82cb216056a.tar.bz2
Fix a crash with global static objects
When global static objects use text codecs in their constructor or destructor we would crash on symbian, as the symbian codec was trying to use a non existing cleanup stack. Task-number: QT-3255 Reviewed-by: Espen Riskedal
-rw-r--r--src/corelib/codecs/qtextcodec.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
index c0aa342..1a08cca 100644
--- a/src/corelib/codecs/qtextcodec.cpp
+++ b/src/corelib/codecs/qtextcodec.cpp
@@ -671,6 +671,11 @@ static void setup()
if (all)
return;
+#ifdef Q_OS_SYMBIAN
+ if (User::TrapHandler() == NULL)
+ return;
+#endif
+
#ifdef Q_DEBUG_TEXTCODEC
if (destroying_is_ok)
qWarning("QTextCodec: Creating new codec during codec cleanup");