diff options
| author | Erik Verbruggen <erik.verbruggen@me.com> | 2013-06-13 12:17:33 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2013-06-17 08:14:39 +0200 |
| commit | 18dcac7ad04077bebf5be7a57b05d5dcbec54711 (patch) | |
| tree | 3defb914fbcdda7d681333bbf2de3ef0d0a2da9d /src/plugins/cpptools/cppmodelmanager.cpp | |
| parent | 42c9c96361f113004fa0af23cfb2164b135f174d (diff) | |
| download | qt-creator-18dcac7ad04077bebf5be7a57b05d5dcbec54711.tar.gz | |
C++: fix encoding/conversion of built-in macros
Task-number: QTCREATORBUG-9404
Change-Id: I732b729e64b065b4ac75c547d9370cbc64918a31
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanager.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppmodelmanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index 7fa7fc3a38..71c32abd6f 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -512,7 +512,7 @@ CppModelManager::WorkingCopy CppModelManager::buildWorkingCopyList() // add the project configuration file QByteArray conf(pp_configuration); conf += definedMacros(); - workingCopy.insert(configurationFileName(), QString::fromUtf8(conf)); + workingCopy.insert(configurationFileName(), QString::fromLocal8Bit(conf)); return workingCopy; } |