Merge remote-tracking branch 'origin/4.6'

Conflicts:
	src/plugins/coreplugin/helpmanager.cpp

Change-Id: I2feb60ec0afb2f22f75dc137a01c3fa217b299d8
This commit is contained in:
Eike Ziller
2018-02-23 10:56:52 +01:00
85 changed files with 1122 additions and 402 deletions

View File

@@ -381,6 +381,8 @@ public:
void gotoBlockStartWithSelection();
void gotoBlockEndWithSelection();
void gotoDocumentStart();
void gotoDocumentEnd();
void gotoLineStart();
void gotoLineStartWithSelection();
void gotoLineEnd();