feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/2.6'

Browse Source 
Conflicts:
	src/libs/utils/fileutils.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/genericdirectuploadservice.cpp
	src/tools/qtcreatorcrashhandler/main.cpp

Change-Id: I830287691e7085fe9c94597e23ec7be64eb8be42
This commit is contained in:
Eike Ziller
2012-10-09 11:50:17 +02:00
parent 8ec446efdc 2b56943a8e
commit d5d1c5e394
76 changed files with 538 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cpptools/cppmodelmanager.cpp
View File

@@ -348,9 +348,11 @@ bool CppPreprocessor::includeFile(const QString &absoluteFilePath, QString *resu
QFile file(absoluteFilePath);
if (file.open(QFile::ReadOnly | QFile::Text)) {
m_included.insert(absoluteFilePath);
QTextCodec *defaultCodec = Core::EditorManager::instance()->defaultTextCodec();
QTextStream stream(&file);
const QString contents = stream.readAll();
*result = contents.toUtf8();
stream.setCodec(defaultCodec);
if (result)
*result = stream.readAll();
file.close();
return true;
}