diff options
author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2017-01-12 18:01:12 +0100 |
---|---|---|
committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2017-01-16 10:17:50 +0000 |
commit | e4e65726614fa4e3ee02f25db755d959850441ea (patch) | |
tree | a76a4aab899eb313f25f0da8a1f3e89ede71b67b /src/plugins/cpptools/cppmodelmanager_test.cpp | |
parent | 4416eecc024e155438c7ed6399182dbff143bd0d (diff) | |
download | qt-creator-e4e65726614fa4e3ee02f25db755d959850441ea.tar.gz |
CppTools: Allow interpreting ambiguous headers as C headers
...instead of C++ headers.
For the Clang Code Model this results in using "-x c-header" instead of
"-x c++-header".
This introduces a new option in Options > C++ > "Code Model" to
configure this.
Change-Id: I8a0ce8fa6155f5ef58743ebc7f1d0b500fbf6599
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanager_test.cpp')
-rw-r--r-- | src/plugins/cpptools/cppmodelmanager_test.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager_test.cpp b/src/plugins/cpptools/cppmodelmanager_test.cpp index d5f0b2fc09..4db38959c3 100644 --- a/src/plugins/cpptools/cppmodelmanager_test.cpp +++ b/src/plugins/cpptools/cppmodelmanager_test.cpp @@ -877,7 +877,8 @@ void CppToolsPlugin::test_modelmanager_precompiled_headers() BaseEditorDocumentParser::Configuration config = parser->configuration(); config.usePrecompiledHeaders = true; parser->setConfiguration(config); - parser->update({CppModelManager::instance()->workingCopy(), nullptr, false}); + parser->update({CppModelManager::instance()->workingCopy(), nullptr, + Language::Cxx, false}); // Check if defines from pch are considered Document::Ptr document = mm->document(fileName); @@ -955,7 +956,8 @@ void CppToolsPlugin::test_modelmanager_defines_per_editor() BaseEditorDocumentParser::Configuration config = parser->configuration(); config.editorDefines = editorDefines.toUtf8(); parser->setConfiguration(config); - parser->update({CppModelManager::instance()->workingCopy(), nullptr, false}); + parser->update({CppModelManager::instance()->workingCopy(), nullptr, + Language::Cxx, false}); Document::Ptr doc = mm->document(main1File); QCOMPARE(nameOfFirstDeclaration(doc), firstDeclarationName); |