diff options
Diffstat (limited to 'src/plugins/cpptools')
-rw-r--r-- | src/plugins/cpptools/cppprojectfile.cpp | 3 | ||||
-rw-r--r-- | src/plugins/cpptools/cpptoolsconstants.h | 1 | ||||
-rw-r--r-- | src/plugins/cpptools/cpptoolsplugin.cpp | 13 |
3 files changed, 11 insertions, 6 deletions
diff --git a/src/plugins/cpptools/cppprojectfile.cpp b/src/plugins/cpptools/cppprojectfile.cpp index 3f1e590619..c409aa8b6a 100644 --- a/src/plugins/cpptools/cppprojectfile.cpp +++ b/src/plugins/cpptools/cppprojectfile.cpp @@ -65,6 +65,8 @@ ProjectFile::Kind ProjectFile::classifyByMimeType(const QString &mt) return CXXSource; if (mt == CppTools::Constants::MOC_MIMETYPE) return CXXSource; + if (mt == CppTools::Constants::CUDA_SOURCE_MIMETYPE) + return CudaSource; if (mt == CppTools::Constants::AMBIGUOUS_HEADER_MIMETYPE) return AmbiguousHeader; return Unsupported; @@ -144,6 +146,7 @@ bool ProjectFile::isCxx(ProjectFile::Kind kind) case ProjectFile::CXXSource: case ProjectFile::ObjCXXHeader: case ProjectFile::ObjCXXSource: + case ProjectFile::CudaSource: return true; default: return false; diff --git a/src/plugins/cpptools/cpptoolsconstants.h b/src/plugins/cpptools/cpptoolsconstants.h index 4cee205b94..873a569335 100644 --- a/src/plugins/cpptools/cpptoolsconstants.h +++ b/src/plugins/cpptools/cpptoolsconstants.h @@ -36,6 +36,7 @@ const char OPEN_HEADER_SOURCE_IN_NEXT_SPLIT[] = "CppTools.OpenHeaderSourceInNext const char TASK_INDEX[] = "CppTools.Task.Index"; const char TASK_SEARCH[] = "CppTools.Task.Search"; const char C_SOURCE_MIMETYPE[] = "text/x-csrc"; +const char CUDA_SOURCE_MIMETYPE[] = "text/vnd.nvidia.cuda.csrc"; const char C_HEADER_MIMETYPE[] = "text/x-chdr"; const char CPP_SOURCE_MIMETYPE[] = "text/x-c++src"; const char OBJECTIVE_C_SOURCE_MIMETYPE[] = "text/x-objcsrc"; diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp index babbd5eacb..a2b73f4340 100644 --- a/src/plugins/cpptools/cpptoolsplugin.cpp +++ b/src/plugins/cpptools/cpptoolsplugin.cpp @@ -277,18 +277,19 @@ static QStringList matchingCandidateSuffixes(ProjectFile::Kind kind) case ProjectFile::CXXHeader: case ProjectFile::ObjCHeader: case ProjectFile::ObjCXXHeader: - return Utils::mimeTypeForName(QLatin1String(Constants::C_SOURCE_MIMETYPE)).suffixes() - + Utils::mimeTypeForName(QLatin1String(Constants::CPP_SOURCE_MIMETYPE)).suffixes() - + Utils::mimeTypeForName(QLatin1String(Constants::OBJECTIVE_C_SOURCE_MIMETYPE)).suffixes() - + Utils::mimeTypeForName(QLatin1String(Constants::OBJECTIVE_CPP_SOURCE_MIMETYPE)).suffixes(); + return mimeTypeForName(Constants::C_SOURCE_MIMETYPE).suffixes() + + mimeTypeForName(Constants::CPP_SOURCE_MIMETYPE).suffixes() + + mimeTypeForName(Constants::OBJECTIVE_C_SOURCE_MIMETYPE).suffixes() + + mimeTypeForName(Constants::OBJECTIVE_CPP_SOURCE_MIMETYPE).suffixes() + + mimeTypeForName(Constants::CUDA_SOURCE_MIMETYPE).suffixes(); case ProjectFile::CSource: case ProjectFile::ObjCSource: - return Utils::mimeTypeForName(QLatin1String(Constants::C_HEADER_MIMETYPE)).suffixes(); + return mimeTypeForName(Constants::C_HEADER_MIMETYPE).suffixes(); case ProjectFile::CXXSource: case ProjectFile::ObjCXXSource: case ProjectFile::CudaSource: case ProjectFile::OpenCLSource: - return Utils::mimeTypeForName(QLatin1String(Constants::CPP_HEADER_MIMETYPE)).suffixes(); + return mimeTypeForName(Constants::CPP_HEADER_MIMETYPE).suffixes(); default: return QStringList(); } |