diff options
| author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2018-10-08 09:49:02 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2018-10-08 12:34:57 +0000 |
| commit | 6aa11eb75e2374bc1c0c643588b3d06d797759be (patch) | |
| tree | e9b21a6049c0b76ff9b179124efa88aa51ecc484 /src/plugins/cpptools/cppmodelmanager.cpp | |
| parent | 167f08e2ce0dd5b10e9436987509bc5392871c5b (diff) | |
| download | qt-creator-6aa11eb75e2374bc1c0c643588b3d06d797759be.tar.gz | |
CppTools/ProjectExplorer: Remove enum duplication
... between CppTools::ProjectPart and ProjectExplorer::ToolChain.
Change-Id: I8b448747e454adbed77547460383b8515462cc81
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanager.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppmodelmanager.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index 9303d66338..5db9dd601d 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -1170,8 +1170,9 @@ ProjectPart::Ptr CppModelManager::fallbackProjectPart() // 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->languageExtensions = ProjectExplorer::LanguageExtension::All; + part->languageExtensions &= ~ProjectExplorer::LanguageExtensions( + ProjectExplorer::LanguageExtension::ObjectiveC); part->qtVersion = ProjectPart::Qt5; part->updateLanguageFeatures(); |