diff options
author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2017-01-18 15:05:46 +0100 |
---|---|---|
committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2017-02-03 11:58:27 +0000 |
commit | 38ba61ec4fda2414f44c50d59ff3683ec0ec3b33 (patch) | |
tree | 7519366c206a9d71afbc9ec88d8bf8884e74b4d1 /src/plugins/cpptools/baseeditordocumentprocessor.cpp | |
parent | 9ac96339ffb44b0db3a8f8e96138b6aa08e5693f (diff) |
CppEditor: Rework showing/switching parse configurations
* Move the combox box for switching the parse configurations out of the
"Additional Preprocessor Directives" dialog ('#'-button) to make it
better visible/accessible. Also, decouple the extra preprocessor
directives from the concrete parse context since this is not anymore
in same dialog.
* The combo box appears only if multiple parse configurations are
available for a file.
* The first time multiple parse configurations are detected, an info bar
is shown that points the user to the combox box. A "Do Not Show Again"
button is provided.
* Upon selecting an entry, the preferred parse configuration is saved as
part of the session. The setting can be cleared with the context menu
entry on the combo box.
Follow-up changes need to ensure that the display name and/or tooltip is
unambiguous, e.g. for qbs and cmake projects.
Change-Id: I9e9773704187291524ad7b605bfdddd83ef5b19d
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/plugins/cpptools/baseeditordocumentprocessor.cpp')
-rw-r--r-- | src/plugins/cpptools/baseeditordocumentprocessor.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/cpptools/baseeditordocumentprocessor.cpp b/src/plugins/cpptools/baseeditordocumentprocessor.cpp index ad26fa653c3..2bf77787d76 100644 --- a/src/plugins/cpptools/baseeditordocumentprocessor.cpp +++ b/src/plugins/cpptools/baseeditordocumentprocessor.cpp @@ -87,6 +87,12 @@ void BaseEditorDocumentProcessor::editorDocumentTimerRestarted() { } +void BaseEditorDocumentProcessor::setParserConfig( + const BaseEditorDocumentParser::Configuration config) +{ + parser()->setConfiguration(config); +} + void BaseEditorDocumentProcessor::runParser(QFutureInterface<void> &future, BaseEditorDocumentParser::Ptr parser, BaseEditorDocumentParser::UpdateParams updateParams) |