summaryrefslogtreecommitdiff
path: root/src/plugins/texteditor
diff options
context:
space:
mode:
authorHugo Holgersson <hugo.holgersson@logikbyran.se>2017-11-30 11:41:05 +0100
committerHugo Holgersson <hugo.holgersson@logikbyran.se>2017-12-19 21:04:52 +0000
commitb7bdb8e2755f77913d40ef8c16b060e1506f24ed (patch)
treebe0b2db2736324d9440bcb23e8b644e13f90e944 /src/plugins/texteditor
parent3192366b44e74c0d2e67ec924cc75644ed8beb75 (diff)
downloadqt-creator-b7bdb8e2755f77913d40ef8c16b060e1506f24ed.tar.gz
TextEditor: Allow direct color styling for function definitions
We can now give FunctionDefintion *any* fore/background color. FunctionDefinition is now a "color overriding mixin" to Function and Virtual Function. Previously, FunctionDefinition could only get a color that was an offset to the color already given to Function and Virtual Function. TEST=The FunctionDefinition-option can now set fore/background colors. Requires Clang. Task-number: QTCREATORBUG-16625 Change-Id: I0ef5fd30a3762aa2cb4a7684fea2620041f7cf7e Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/plugins/texteditor')
-rw-r--r--src/plugins/texteditor/texteditorsettings.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/texteditor/texteditorsettings.cpp b/src/plugins/texteditor/texteditorsettings.cpp
index 2b70a70721..560d4dce53 100644
--- a/src/plugins/texteditor/texteditorsettings.cpp
+++ b/src/plugins/texteditor/texteditorsettings.cpp
@@ -324,8 +324,7 @@ TextEditorSettings::TextEditorSettings(QObject *parent)
formatDescr.emplace_back(C_FUNCTION_DEFINITION,
tr("Function Definition"),
tr("Name of function at its definition."),
- Format::createMixinFormat(),
- FormatDescription::ShowFontUnderlineAndRelativeControls);
+ Format::createMixinFormat());
Format outputArgumentFormat = Format::createMixinFormat();
outputArgumentFormat.setItalic(true);
formatDescr.emplace_back(C_OUTPUT_ARGUMENT,