summaryrefslogtreecommitdiff
path: root/tools/qdoc3/pagegenerator.cpp
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2010-02-02 20:44:08 +0100
committerDavid Boddie <dboddie@trolltech.com>2010-02-02 20:44:08 +0100
commit7a4d0130441bae27a302e694828ec71ade9e6005 (patch)
treefc883076093f8c4d4d3f2c3f00784c7e4b30c8b6 /tools/qdoc3/pagegenerator.cpp
parent8acb069bd3a68afc36566503ca7f9d0fc808e170 (diff)
downloadqt4-tools-7a4d0130441bae27a302e694828ec71ade9e6005.tar.gz
qdoc: Added support for different source and output character encodings.
Previously, qdoc assumed Latin1 (ISO-8859-1) for source code and other documentation, and wrote out XHTML with the same encoding. This change adds additional configuration options (sourceencoding, outputencoding, naturallanguage) that enable translated documentation in non-Latin1 encodings to be built with qdoc. To be reviewed before merge into the master branch. Reviewed-by: Trust Me
Diffstat (limited to 'tools/qdoc3/pagegenerator.cpp')
-rw-r--r--tools/qdoc3/pagegenerator.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qdoc3/pagegenerator.cpp b/tools/qdoc3/pagegenerator.cpp
index a001c10212..e6371097b7 100644
--- a/tools/qdoc3/pagegenerator.cpp
+++ b/tools/qdoc3/pagegenerator.cpp
@@ -176,7 +176,7 @@ void PageGenerator::beginSubPage(const Location& location,
location.fatal(tr("Cannot open output file '%1'")
.arg(outFile->fileName()));
QTextStream *out = new QTextStream(outFile);
- out->setCodec("ISO-8859-1");
+ out->setCodec(outputCodec);
outStreamStack.push(out);
}