Commit 18dcac7a authored by Erik Verbruggen's avatar Erik Verbruggen Committed by Nikolai Kosjar

C++: fix encoding/conversion of built-in macros

Task-number: QTCREATORBUG-9404

Change-Id: I732b729e64b065b4ac75c547d9370cbc64918a31
Reviewed-by: Orgad Shaneh's avatarOrgad Shaneh <orgads@gmail.com>
Reviewed-by: default avatarNikolai Kosjar <nikolai.kosjar@digia.com>
parent 42c9c963
......@@ -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;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment