diff options
author | Erik Verbruggen <erik.verbruggen@digia.com> | 2013-08-19 15:47:51 +0200 |
---|---|---|
committer | Erik Verbruggen <erik.verbruggen@digia.com> | 2013-09-11 09:43:14 +0200 |
commit | f7c68f6baf104729e8d2fb3a0693b3c59928f8d3 (patch) | |
tree | fc0b7227fb28425b65f194d1f6d58bb4d5f53299 /src/plugins/genericprojectmanager | |
parent | eebb1dfcf4d0d4a391a77ab9e095188f63b616e4 (diff) |
C++: change working-copy to work on UTF-8 encoded QByteArrays.
These not only take less space than UTF-16 encoded QStrings, but due to
the caching in the CppEditorSupport also take less time to build.
This patch also fixes a number of possible encoding issues, where files
and constant strings were (falsely) assumed to be UTF-8.
Change-Id: Ib6f91c9a94ebed5b5dfbd4eb2998825c62c72784
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'src/plugins/genericprojectmanager')
-rw-r--r-- | src/plugins/genericprojectmanager/genericproject.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index 0c441167be..6dc882b787 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -221,8 +221,11 @@ void GenericProject::parseProject(RefreshOptions options) m_defines.clear(); QFile configFile(configFileName()); - if (configFile.open(QFile::ReadOnly)) - m_defines = configFile.readAll(); + if (configFile.open(QFile::ReadOnly)) { + // convert from local/file encoding to UTF-8 + QTextStream configStream(&configFile); + m_defines = configStream.readAll().toUtf8(); + } } if (options & Files) |