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

Merge remote-tracking branch 'origin/2.6'

Browse Source 
Conflicts:
	qtcreator.qbp
	src/libs/QtcLibrary.qbs
	src/plugins/QtcPlugin.qbs
	src/tools/QtcTool.qbs

Change-Id: I3acea26888febe8f96d2131932266ed88b9f55f5
This commit is contained in:
Eike Ziller
2012-09-19 18:02:46 +02:00
parent c0321ac305 44177392ec
commit b947861c59
104 changed files with 2560 additions and 2030 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/texteditor/basetexteditor.cpp
View File

@@ -1807,6 +1807,7 @@ void BaseTextEditorWidget::keyPressEvent(QKeyEvent *e)
d->m_autoCompleter->setAutoParenthesesEnabled(d->autoParenthesisOverwriteBackup);
d->m_autoCompleter->setSurroundWithEnabled(d->surroundWithEnabledOverwriteBackup);
setOverwriteMode(false);
viewport()->update();
} else {
d->autoParenthesisOverwriteBackup = d->m_autoCompleter->isAutoParenthesesEnabled();
d->surroundWithEnabledOverwriteBackup = d->m_autoCompleter->isSurroundWithEnabled();