diff options
| author | con <qtc-committer@nokia.com> | 2009-10-26 15:48:26 +0100 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2009-10-26 15:48:26 +0100 |
| commit | bac9c64f938d25788f5cdebf39aa5342788a5087 (patch) | |
| tree | 70b2dbe08d6c32349c5041dc821fefda277c10cf /src/plugins/cpptools/cppmodelmanager.cpp | |
| parent | 441ece365aba579eeb66acb509df466f5029c580 (diff) | |
| parent | 4091efb47f57e5c15b05089792389d9a512ad6e5 (diff) | |
| download | qt-creator-bac9c64f938d25788f5cdebf39aa5342788a5087.tar.gz | |
Merge commit 'origin/1.3'
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanager.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppmodelmanager.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index 1d88692056..75f8f743b3 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -331,9 +331,8 @@ void CppPreprocessor::resetEnvironment() bool CppPreprocessor::includeFile(const QString &absoluteFilePath, QString *result) { - if (absoluteFilePath.isEmpty() || m_included.contains(absoluteFilePath)) { + if (absoluteFilePath.isEmpty() || m_included.contains(absoluteFilePath)) return true; - } if (m_workingCopy.contains(absoluteFilePath)) { m_included.insert(absoluteFilePath); |