feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.7'

Browse Source 
Change-Id: I3c5d7e9e8c589ad4425cd89d61e1f572f5cb7997
This commit is contained in:
Eike Ziller
2018-06-19 10:03:28 +02:00
parent 23e27ead9e 8623a93998
commit 3bbe535b95
110 changed files with 913 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/android/javaeditor.cpp
View File

@@ -75,7 +75,6 @@ JavaEditorFactory::JavaEditorFactory()
setUseGenericHighlighter(true);
setCommentDefinition(Utils::CommentDefinition::CppStyle);
setEditorActionHandlers(TextEditor::TextEditorActionHandler::UnCommentSelection);
setMarksVisible(true);
setCompletionAssistProvider(new TextEditor::KeywordsCompletionAssistProvider(keywords));
}