diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-02-11 10:33:15 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-02-11 10:33:15 (GMT) |
| commit | fe7f5f8a183099b8503bb25d69fe5939014e0009 (patch) | |
| tree | 7a6edfd7b0ce36387ca5d969654a2c92c53061ce /tools/qdoc3/config.cpp | |
| parent | 802051dd1eb8dd63e84ac0c241f560d8cdf350c5 (diff) | |
| parent | f7c910a9d44eb7f775f93fd8ccf94c3e8fd38201 (diff) | |
| download | Qt-fe7f5f8a183099b8503bb25d69fe5939014e0009.zip Qt-fe7f5f8a183099b8503bb25d69fe5939014e0009.tar.gz Qt-fe7f5f8a183099b8503bb25d69fe5939014e0009.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1
Diffstat (limited to 'tools/qdoc3/config.cpp')
| -rw-r--r-- | tools/qdoc3/config.cpp | 4 |
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(); |