From a4cbd970e52bf03bcd45c1a3da84bd3a1c2a5065 Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik.verbruggen@nokia.com>
Date: Thu, 11 Nov 2010 11:00:40 +0100
Subject: [PATCH] Changed license template reading to use the global default
encoding.
Task-number: QTCREATORBUG-3039
Reviewed-by: con
---
src/plugins/cpptools/cppfilesettingspage.cpp | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp
index 2076aaca2ad..59f18ea304a 100644
--- a/src/plugins/cpptools/cppfilesettingspage.cpp
+++ b/src/plugins/cpptools/cppfilesettingspage.cpp
@@ -45,6 +45,7 @@
#include <QtCore/QCoreApplication>
#include <QtCore/QDate>
#include <QtCore/QLocale>
+#include <QtCore/QTextCodec>
#include <QtCore/QTextStream>
#include <QtGui/QFileDialog>
@@ -208,7 +209,13 @@ QString CppFileSettings::licenseTemplate(const QString &fileName, const QString
qWarning("Unable to open the license template %s: %s", qPrintable(path), qPrintable(file.errorString()));
return QString();
}
- QString license = QString::fromUtf8(file.readAll());
+
+ QTextCodec *codec = Core::EditorManager::instance()->defaultTextEncoding();
+ QTextStream licenseStream(&file);
+ licenseStream.setCodec(codec);
+ licenseStream.setAutoDetectUnicode(true);
+ QString license = licenseStream.readAll();
+
parseLicenseTemplatePlaceholders(&license, fileName, className);
// Ensure exactly one additional new line separating stuff
const QChar newLine = QLatin1Char('\n');
--
GitLab