diff options
author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2017-01-19 15:46:40 +0100 |
---|---|---|
committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2017-01-26 07:52:54 +0000 |
commit | 741596481900347ef4c69d80efdffe710e79ff6b (patch) | |
tree | c7c9471da1abe791de994d8256fcf2b53d03dbbe /src/plugins/cpptools/cppmodelmanager_test.cpp | |
parent | bddfe21961f59ee471b302da9bc7a5c7ee4f561d (diff) | |
download | qt-creator-741596481900347ef4c69d80efdffe710e79ff6b.tar.gz |
CppTools: Fix choosing project part after project open
As long as there are project parts for a source file, always determine
the best project part, instead of trying to stick to the previous one.
This ensures the best project part at all times and simplifies the code.
Change-Id: I25ea3eb43a5a3e6d93688d4b8965f596dc9ae22b
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanager_test.cpp')
-rw-r--r-- | src/plugins/cpptools/cppmodelmanager_test.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager_test.cpp b/src/plugins/cpptools/cppmodelmanager_test.cpp index 0248e3ac8e..91970ae297 100644 --- a/src/plugins/cpptools/cppmodelmanager_test.cpp +++ b/src/plugins/cpptools/cppmodelmanager_test.cpp @@ -879,8 +879,7 @@ void CppToolsPlugin::test_modelmanager_precompiled_headers() BaseEditorDocumentParser::Configuration config = parser->configuration(); config.usePrecompiledHeaders = true; parser->setConfiguration(config); - parser->update({CppModelManager::instance()->workingCopy(), nullptr, - Language::Cxx, false}); + parser->update({CppModelManager::instance()->workingCopy(), nullptr, Language::Cxx, false}); // Check if defines from pch are considered Document::Ptr document = mm->document(fileName); @@ -958,8 +957,7 @@ 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, - Language::Cxx, false}); + parser->update({CppModelManager::instance()->workingCopy(), nullptr, Language::Cxx, false}); Document::Ptr doc = mm->document(main1File); QCOMPARE(nameOfFirstDeclaration(doc), firstDeclarationName); |