forked from qt-creator/qt-creator
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>
This commit is contained in:
committed by
Nikolai Kosjar
parent
42c9c96361
commit
18dcac7ad0
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user