summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/config.cpp
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2010-02-04 20:17:42 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2010-02-04 20:17:42 (GMT)
commita2fe25025f75ae750df22c59c338005eeda3d744 (patch)
tree94326418ce2c82d1b96a47694cb8948cdcda5a9f /tools/qdoc3/config.cpp
parentacbbafc95096701ae0eb6917a5922a371cb37c69 (diff)
downloadQt-a2fe25025f75ae750df22c59c338005eeda3d744.zip
Qt-a2fe25025f75ae750df22c59c338005eeda3d744.tar.gz
Qt-a2fe25025f75ae750df22c59c338005eeda3d744.tar.bz2
Doc: Added Simplified Chinese documents and build rules for them.
Also updated qdoc's configuration reader so that we can put UTF-8 content in the .qdocconf files later. Reviewed-by: Trust Me
Diffstat (limited to 'tools/qdoc3/config.cpp')
-rw-r--r--tools/qdoc3/config.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/qdoc3/config.cpp b/tools/qdoc3/config.cpp
index f62ec24..acb1576 100644
--- a/tools/qdoc3/config.cpp
+++ b/tools/qdoc3/config.cpp
@@ -671,7 +671,9 @@ void Config::load(Location location, const QString& fileName)
location.fatal(tr("Cannot open file '%1': %2").arg(fileName).arg(fin.errorString()));
}
- QString text = fin.readAll();
+ QTextStream stream(&fin);
+ stream.setCodec("UTF-8");
+ QString text = stream.readAll();
text += QLatin1String("\n\n");
text += QChar('\0');
fin.close();