diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2013-10-01 14:48:31 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2013-10-23 12:52:40 +0200 |
| commit | d57b405f298994eafe192914d4efb6697c7e0b48 (patch) | |
| tree | 268602f3698497ac89a5c336c5ddc78f5bea0cfc /src/plugins | |
| parent | 336644a70dc6b6d9b1be0d8a6f14eb2aadf38778 (diff) | |
| download | qt-creator-d57b405f298994eafe192914d4efb6697c7e0b48.tar.gz | |
CppTools: fix inclusion of "injected" defines.
Task-number: QTCREATORBUG-10280
Change-Id: Ibc6ffeedb97a31a35a2d1f00625506f844692e16
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/cpptools/cpppreprocessor.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/cpptools/cppsnapshotupdater.cpp | 10 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/plugins/cpptools/cpppreprocessor.cpp b/src/plugins/cpptools/cpppreprocessor.cpp index f60c853b83..63e64c61a1 100644 --- a/src/plugins/cpptools/cpppreprocessor.cpp +++ b/src/plugins/cpptools/cpppreprocessor.cpp @@ -416,7 +416,6 @@ void CppPreprocessor::sourceNeeded(unsigned line, const QString &fileName, Inclu if (m_dumpFileNameWhileParsing) { qDebug() << "Parsing file:" << absoluteFileName << "contents:" << contents.size() << "bytes"; - ; } Document::Ptr doc = m_snapshot.document(absoluteFileName); diff --git a/src/plugins/cpptools/cppsnapshotupdater.cpp b/src/plugins/cpptools/cppsnapshotupdater.cpp index 4b3e9fedb4..11cd3ff5b3 100644 --- a/src/plugins/cpptools/cppsnapshotupdater.cpp +++ b/src/plugins/cpptools/cppsnapshotupdater.cpp @@ -153,15 +153,21 @@ void SnapshotUpdater::update(CppModelManager::WorkingCopy workingCopy) preproc.setIncludePaths(m_includePaths); preproc.setFrameworkPaths(m_frameworkPaths); preproc.run(configurationFileName); - if (m_usePrecompiledHeaders) + if (m_usePrecompiledHeaders) { foreach (const QString &precompiledHeader, m_precompiledHeaders) preproc.run(precompiledHeader); + } if (!m_editorDefines.isEmpty()) preproc.run(editorDefinesFileName); preproc.run(m_fileInEditor); m_snapshot = preproc.snapshot(); - m_snapshot = m_snapshot.simplified(document()); + Snapshot newSnapshot = m_snapshot.simplified(document()); + for (Snapshot::const_iterator i = m_snapshot.begin(), ei = m_snapshot.end(); i != ei; ++i) { + if (Client::isInjectedFile(i.key())) + newSnapshot.insert(i.value()); + } + m_snapshot = newSnapshot; m_deps.build(m_snapshot); foreach (Document::Ptr doc, m_snapshot) { |