diff options
| author | Jan-Arve Saether <jan-arve.saether@nokia.com> | 2012-08-06 09:50:50 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-06 16:04:32 +0200 |
| commit | 57265a20cba2a1d5990dffb857c9e68e58644e28 (patch) | |
| tree | 44313abbbad73269f71c3863d6aac955745b54ca | |
| parent | 195663260cd00aa8b5a907cd802d9be343d6f34a (diff) | |
Make sure codecForLocale returns a valid codec in bootstrap mode
This was a regression caused by acbfb4d777474aadd2813614108,
causing for instance qdoc to crash.
Change-Id: Id8daa19d467c4f1729e5a5a203a388f16ec4a6de
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| -rw-r--r-- | src/corelib/codecs/qtextcodec.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp index c376e10995..fb3151ba81 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -249,10 +249,10 @@ static QTextCodec *setupLocaleMapper() locale = checkForCodec("ISO 8859-15"); } +#endif // If everything failed, we default to 8859-1 if (!locale) locale = QTextCodec::codecForName("ISO 8859-1"); -#endif globalData->codecForLocale.storeRelease(locale); return locale; } |