--- a/tools/qdoc3/config.cpp	Wed Jun 23 19:07:03 2010 +0300
+++ b/tools/qdoc3/config.cpp	Tue Jul 06 15:10:48 2010 +0300
@@ -43,7 +43,11 @@
   config.cpp
 */
 
-#include <QtCore>
+#include <QDir>
+#include <QVariant>
+#include <QFile>
+#include <QTemporaryFile>
+#include <QTextStream>
 
 #include "archiveextractor.h"
 #include "config.h"
@@ -524,8 +528,11 @@
 {
     QStringList::ConstIterator e = fileExtensions.begin();
     while (e != fileExtensions.end()) {
-	QString filePath = findFile(location, files, dirs, fileBase + "." + *e,
-				     userFriendlyFilePath);
+	QString filePath = findFile(location,
+                                    files,
+                                    dirs,
+                                    fileBase + "." + *e,
+                                    userFriendlyFilePath);
 	if (!filePath.isEmpty())
 	    return filePath;
 	++e;
@@ -671,7 +678,9 @@
             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();