diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-10 23:21:26 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-10 23:21:26 (GMT) |
| commit | 989b2d3a696781256de23a420d58466ab9c76836 (patch) | |
| tree | c66e846b2e63b19448e094dbc2fab46b4c409d7b | |
| parent | 698c7a45d156e9f85afb870ffcd5b99d08d8677b (diff) | |
| parent | d5d013b46ef2ea51172d364e8b32a82cb216056a (diff) | |
| download | Qt-989b2d3a696781256de23a420d58466ab9c76836.zip Qt-989b2d3a696781256de23a420d58466ab9c76836.tar.gz Qt-989b2d3a696781256de23a420d58466ab9c76836.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix a crash with global static objects
| -rw-r--r-- | src/corelib/codecs/qtextcodec.cpp | 5 |
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"); |