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

Merge remote branch 'origin/2.1'

Browse Source 
Conflicts:
	share/qtcreator/templates/mobileapp/app.pro
	share/qtcreator/templates/qmlapp/app.pro
	src/plugins/cpptools/cpptools.pro
This commit is contained in:
dt
2010-10-04 16:07:46 +02:00
parent a84ad42741 c7142affef
commit 6b6d9871b8
386 changed files with 12674 additions and 4573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/fakevim/fakevimhandler.cpp
View File

@@ -2657,6 +2657,8 @@ EventResult FakeVimHandler::Private::handleInsertMode(const Input &input)
enterCommandMode();
m_submode = NoSubMode;
m_ctrlVActive = false;
m_opcount.clear();
m_mvcount.clear();
} else if (m_ctrlVActive) {
insertInInsertMode(input.raw());
} else if (input.isControl('v')) {