diff options
| author | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2014-02-24 12:12:14 -0300 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2014-03-10 13:42:51 +0100 |
| commit | 4bf11c7df6aac526a9272a827fa96d099253cbcf (patch) | |
| tree | 3952776591a935426e008ece5329e6d8ae1b3622 /src/plugins/cpptools/cpppreprocessor.cpp | |
| parent | aa796a9fc06dc1817b99355a333d2b0edce7215b (diff) | |
| download | qt-creator-4bf11c7df6aac526a9272a827fa96d099253cbcf.tar.gz | |
CppTools: Add diagnostic message for non-existent absolute paths
Change-Id: I9a05a92c1adc37db0c918127715714d1f6d2a78d
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cpppreprocessor.cpp')
| -rw-r--r-- | src/plugins/cpptools/cpppreprocessor.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/cpptools/cpppreprocessor.cpp b/src/plugins/cpptools/cpppreprocessor.cpp index dd185a7e39..b276885001 100644 --- a/src/plugins/cpptools/cpppreprocessor.cpp +++ b/src/plugins/cpptools/cpppreprocessor.cpp @@ -235,10 +235,12 @@ QString CppPreprocessor::cleanPath(const QString &path) QString CppPreprocessor::resolveFile_helper(const QString &fileName, IncludeType type) { - const QFileInfo fileInfo(fileName); - if (isInjectedFile(fileName) || fileInfo.isAbsolute()) + if (isInjectedFile(fileName)) return fileName; + if (QFileInfo(fileName).isAbsolute()) + return checkFile(fileName) ? fileName : QString(); + if (type == IncludeLocal && m_currentDoc) { const QFileInfo currentFileInfo(m_currentDoc->fileName()); const QString path = cleanPath(currentFileInfo.absolutePath()) + fileName; |