projects
/
profile
/
ivi
/
qtbase.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1956632
)
Make sure codecForLocale returns a valid codec in bootstrap mode
author
Jan-Arve Saether
<jan-arve.saether@nokia.com>
Mon, 6 Aug 2012 07:50:50 +0000
(09:50 +0200)
committer
Qt by Nokia
<qt-info@nokia.com>
Mon, 6 Aug 2012 14:04:32 +0000
(16:04 +0200)
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>
src/corelib/codecs/qtextcodec.cpp
patch
|
blob
|
history
diff --git
a/src/corelib/codecs/qtextcodec.cpp
b/src/corelib/codecs/qtextcodec.cpp
index
c376e10
..
fb3151b
100644
(file)
--- 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;
}