Merge remote-tracking branch 'origin/4.7'

Change-Id: I3c5d7e9e8c589ad4425cd89d61e1f572f5cb7997
2018-06-19 10:03:28 +02:00
parent 23e27ead9e 8623a93998
commit 3bbe535b95
110 changed files with 913 additions and 260 deletions
--- a/src/plugins/pythoneditor/pythoneditor.cpp
+++ b/src/plugins/pythoneditor/pythoneditor.cpp
@@ -57,7 +57,6 @@ PythonEditorFactory::PythonEditorFactory()
    setSyntaxHighlighterCreator([] { return new PythonHighlighter; });
    setCommentDefinition(Utils::CommentDefinition::HashStyle);
    setParenthesesMatchingEnabled(true);
-    setMarksVisible(true);
    setCodeFoldingSupported(true);
 }