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

C++: pass #include_next down to CppPreprocessor::tryIncludeFile

Browse Source 
This does not yet resolve the file using the proper mechanism.

Change-Id: I04913e8b01ae0c3411961f0c1cffe07202f06a0a
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
hjk
2013-01-03 17:22:19 +01:00
committed by Erik Verbruggen
parent 40eecd87c9
commit b934cc196c
4 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -373,13 +373,15 @@ QString CppPreprocessor::tryIncludeFile(QString &fileName, IncludeType type, uns
return QString();
}
const QString originalFileName = fileName;
const QString contents = tryIncludeFile_helper(fileName, type, revision);
m_fileNameCache.insert(originalFileName, fileName);
return contents;
}
const QString originalFileName = fileName;
const QString contents = tryIncludeFile_helper(fileName, type, revision);
if (type == IncludeGlobal)
m_fileNameCache.insert(originalFileName, fileName);
return contents;
// IncludeLocal, IncludeNext
return tryIncludeFile_helper(fileName, type, revision);
}
QString CppPreprocessor::cleanPath(const QString &path)