diff options
| author | ck <qt-info@nokia.com> | 2009-10-26 15:53:33 +0100 |
|---|---|---|
| committer | ck <qt-info@nokia.com> | 2009-10-26 15:53:33 +0100 |
| commit | 11706165a24fd74672f088636055518591cf7f77 (patch) | |
| tree | c5fd1e1ecc71398429d699aaec12105eff122ad7 /src/plugins/cpptools/cppmodelmanager.cpp | |
| parent | 0edf1b48a6ea3e2271c21f97d573b649b4ca9a12 (diff) | |
| parent | bac9c64f938d25788f5cdebf39aa5342788a5087 (diff) | |
| download | qt-creator-11706165a24fd74672f088636055518591cf7f77.tar.gz | |
Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline
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); |