diff options
| author | Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> | 2015-11-05 13:57:57 +0100 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> | 2015-11-06 11:54:16 +0000 |
| commit | 23fa5a7efd164eeaa0c1e48acdabdff738889aab (patch) | |
| tree | 013d9a9763ab8ec437162c3c2af3de04a8d30c15 /src/plugins/cpptools/cppmodelmanager.cpp | |
| parent | 08fcb7f3179f962394fa600becd133c58f275bf6 (diff) | |
| download | qt-creator-23fa5a7efd164eeaa0c1e48acdabdff738889aab.tar.gz | |
Clang: Provide the language option to the backend
Provide the language option (e.g. "-x c++-header") when registering a
translation unit for the editor.
Task-number: QTCREATORBUG-14787
Change-Id: Ie06f9fdab302f1b21ba72cdb65b6aabf9f7bc04c
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanager.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppmodelmanager.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index 70012ab682..61e87cf7a9 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -948,7 +948,12 @@ ProjectPart::Ptr CppModelManager::fallbackProjectPart() const part->projectDefines = d->m_definedMacros; part->headerPaths = d->m_headerPaths; part->languageVersion = ProjectPart::CXX14; + + // Do not activate ObjectiveCExtensions since this will lead to the + // "objective-c++" language option for a project-less *.cpp file. part->languageExtensions = ProjectPart::AllExtensions; + part->languageExtensions &= ~ProjectPart::ObjectiveCExtensions; + part->qtVersion = ProjectPart::Qt5; part->updateLanguageFeatures(); |