diff options
author | Erik Verbruggen <erik.verbruggen@digia.com> | 2013-05-02 11:24:34 +0200 |
---|---|---|
committer | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2013-07-18 16:45:27 +0200 |
commit | 1478e661edfee239dd23a4793217a560c27036e0 (patch) | |
tree | e8e50d1131dc97a861298e8b8788a4a895185bca /src/plugins/qt4projectmanager/qt4project.cpp | |
parent | 732f8a06aec03a07f18e8f7a7e6092e0a56b57ea (diff) |
Introduced mime-type for ObjC++.
Updated/fixed the code to treat treat text/x-objcsrc and
text/x-objc++src correctly.
Change-Id: I1ab97577c786a28381398e4e0fac177325d00d7b
Reviewed-by: Sergey Shambir <sergey.shambir.auto@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Diffstat (limited to 'src/plugins/qt4projectmanager/qt4project.cpp')
-rw-r--r-- | src/plugins/qt4projectmanager/qt4project.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp index 67dae42f81..3ea6828eb1 100644 --- a/src/plugins/qt4projectmanager/qt4project.cpp +++ b/src/plugins/qt4projectmanager/qt4project.cpp @@ -588,7 +588,9 @@ void Qt4Project::updateCppCodeModel() ProjectFile::CXXSource)); foreach (const QString &file, pro->variableValue(ObjCSourceVar)) { allFiles << file; - part->files << ProjectFile(file, ProjectFile::ObjCSource); + // Although the enum constant is called ObjCSourceVar, it actually is ObjC++ source + // code, as qmake does not handle C (and ObjC). + part->files << ProjectFile(file, ProjectFile::ObjCXXSource); } foreach (const QString &file, pro->variableValue(ObjCHeaderVar)) { allFiles << file; |