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

Merge remote-tracking branch 'origin/3.0'

Browse Source 
Conflicts:
	src/plugins/qmakeprojectmanager/qmakeproject.cpp

Change-Id: Id6ac9051d2564788bb180e5a99243d588312ae99
This commit is contained in:
Eike Ziller
2013-10-30 13:34:46 +01:00
parent bcd704d7bf 88c647ce68
commit 0ddb6cac29
341 changed files with 3480 additions and 2241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/cpptools/cpppreprocessor.cpp
View File

@@ -223,11 +223,6 @@ QString CppPreprocessor::cleanPath(const QString &path)
return result;
}
static inline bool isInjectedFile(const QString &fileName)
{
return fileName.startsWith(QLatin1Char('<')) && fileName.endsWith(QLatin1Char('>'));
}
QString CppPreprocessor::resolveFile_helper(const QString &fileName, IncludeType type)
{
const QFileInfo fileInfo(fileName);