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

Merge remote-tracking branch 'origin/3.2'

Browse Source 
Conflicts:
	src/plugins/projectexplorer/projectexplorer.cpp

Change-Id: I6dffc1925e6bf35cf6e9fe0676c11d1a5143a208
This commit is contained in:
Eike Ziller
2014-09-29 13:40:53 +02:00
parent b2487e1683 6bf9a19276
commit d008779bf7
20 changed files with 312 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/texteditor/texteditor.cpp
View File

@@ -6254,7 +6254,8 @@ void BaseTextEditorWidget::cut()
void BaseTextEditorWidget::selectAll()
{
d->disableBlockSelection();
if (d->m_inBlockSelectionMode)
d->disableBlockSelection();
QPlainTextEdit::selectAll();
}