diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-07-03 16:55:27 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-07-03 16:55:27 +0200 |
| commit | 8685ff8a28d54938f8178966954f7e36b2d15a20 (patch) | |
| tree | 2e05c46e4ae061f76aa6ab1ed85f5d6ad2269652 /src/plugins/cpptools/cpppreprocessor.cpp | |
| parent | 99647b89e57e3d2ba48d26b8ae6f607d56b91477 (diff) | |
| parent | b05603a44d67d1cfa080a16ae774485d26152f4f (diff) | |
| download | qt-creator-8685ff8a28d54938f8178966954f7e36b2d15a20.tar.gz | |
Merge remote-tracking branch 'origin/2.8' into HEAD
Conflicts:
qtcreator.pri
qtcreator.qbs
Change-Id: I5d2018d3437b99bcdffa92bf1a212f42923c4fad
Diffstat (limited to 'src/plugins/cpptools/cpppreprocessor.cpp')
| -rw-r--r-- | src/plugins/cpptools/cpppreprocessor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cpppreprocessor.cpp b/src/plugins/cpptools/cpppreprocessor.cpp index e16553699a..44e3bcada4 100644 --- a/src/plugins/cpptools/cpppreprocessor.cpp +++ b/src/plugins/cpptools/cpppreprocessor.cpp @@ -233,7 +233,7 @@ QString CppPreprocessor::resolveFile_helper(const QString &fileName, IncludeType foreach (const QString &includePath, m_includePaths) { QString path = includePath + fileName; - if (checkFile(path)) + if (m_workingCopy.contains(path) || checkFile(path)) return path; } |