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:
17a68ee
)
QDoc: Set the default output encoding for HTML to UTF-8.
author
Casper van Donderen
<casper.vandonderen@nokia.com>
Wed, 1 Aug 2012 17:41:20 +0000
(19:41 +0200)
committer
Qt by Nokia
<qt-info@nokia.com>
Thu, 2 Aug 2012 18:38:54 +0000
(20:38 +0200)
Change-Id: Ic6d8efae967514e143f224aed4c761a4c01eb434
Reviewed-by: Martin Smith <martin.smith@nokia.com>
src/tools/qdoc/htmlgenerator.cpp
patch
|
blob
|
history
diff --git
a/src/tools/qdoc/htmlgenerator.cpp
b/src/tools/qdoc/htmlgenerator.cpp
index
0397be0
..
654b7b0
100644
(file)
--- a/
src/tools/qdoc/htmlgenerator.cpp
+++ b/
src/tools/qdoc/htmlgenerator.cpp
@@
-177,7
+177,7
@@
void HtmlGenerator::initializeGenerator(const Config &config)
outputEncoding = config.getString(CONFIG_OUTPUTENCODING);
if (outputEncoding.isEmpty())
- outputEncoding = QLatin1String("
ISO-8859-1
");
+ outputEncoding = QLatin1String("
UTF-8
");
outputCodec = QTextCodec::codecForName(outputEncoding.toLocal8Bit());
naturalLanguage = config.getString(CONFIG_NATURALLANGUAGE);