Changeset 846 for trunk/tools/qdoc3/config.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/qdoc3/config.cpp (modified) (4 diffs)

trunk/tools/qdoc3/config.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -44 +44 @@
 */
 
-#include <QtCore>
+#include <QDir>
+#include <QVariant>
+#include <QFile>
+#include <QTemporaryFile>
+#include <QTextStream>
 
 #include "archiveextractor.h"
@@ -525 +529 @@
     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;
@@ -672 +679 @@
     }
 
-    QString text = fin.readAll();
+    QTextStream stream(&fin);
+    stream.setCodec("UTF-8");
+    QString text = stream.readAll();
     text += QLatin1String("\n\n");
     text += QChar('\0');