diff options
| author | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2013-07-01 10:25:03 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2013-07-02 12:09:43 +0200 |
| commit | c264c0d2137d15ec3746ed0f3bd80f225671b4a6 (patch) | |
| tree | 83f982b9eec9cc55c9186ff227364caca8cec393 /src/plugins/cpptools/cpppreprocessor.cpp | |
| parent | 69a00cbabecd6692a07d688db3fd52d540a0aa84 (diff) | |
| download | qt-creator-c264c0d2137d15ec3746ed0f3bd80f225671b4a6.tar.gz | |
C++: Fix resolving ui_* files in CppPreprocessor
The working copy contains the artificial ui_* files and therefore we
have to consider it while resolving include files.
Task-number: QTCREATORBUG-9683
Change-Id: Icb3387b4cd885b3652bae3f1da465d3e0f633332
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
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 825b29ce8c..57a3fb4a72 100644 --- a/src/plugins/cpptools/cpppreprocessor.cpp +++ b/src/plugins/cpptools/cpppreprocessor.cpp @@ -231,7 +231,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; } |