diff options
author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2016-11-29 17:32:34 +0100 |
---|---|---|
committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2016-12-12 13:49:09 +0000 |
commit | 3a369552c68cf897ae7d1712f35c938f0d047492 (patch) | |
tree | c9f4e389abfe6cad6e74e5d00d1fd206bb0b87e9 /src/plugins/cpptools/cpptoolsplugin.cpp | |
parent | f54d4fc3db2d2472a46e6fda68d55624e0bbe344 (diff) | |
download | qt-creator-3a369552c68cf897ae7d1712f35c938f0d047492.tar.gz |
CppTools: Classify ambiguous headers depending on other files
This applies for all project managers, except qmake. The qmake project
manager will make use of this in follow up changes.
Before, "foo.h" was always recognized as a CXXHeader. Now, it depends on
the other files. E.g. in a file list {"foo.h", "foo.c"} foo.h is now a
CHeader. In {"foo.h", "foo.c", "bar.cpp"} the file "foo.h" is ambiguous
and we will create two project parts, one where it is a CHeader, the
other where it is a CXXHeader.
Change-Id: I50505163368742584b1380c284d42cbe07cb4fc9
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/plugins/cpptools/cpptoolsplugin.cpp')
-rw-r--r-- | src/plugins/cpptools/cpptoolsplugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp index 71c3ac6f3b..40603ce935 100644 --- a/src/plugins/cpptools/cpptoolsplugin.cpp +++ b/src/plugins/cpptools/cpptoolsplugin.cpp @@ -279,7 +279,7 @@ static QStringList matchingCandidateSuffixes(ProjectFile::Kind kind) { Utils::MimeDatabase mdb; switch (kind) { - // Note that C/C++ headers are undistinguishable + case ProjectFile::AmbiguousHeader: case ProjectFile::CHeader: case ProjectFile::CXXHeader: case ProjectFile::ObjCHeader: |