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

Merge remote-tracking branch 'origin/3.0'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I0485b1bf75cc02f9fbcb5c05e350da91f491abe3
This commit is contained in:
Eike Ziller
2013-11-25 08:57:10 +01:00
parent b75919cb89 ba03037561
commit 5e2e0e469b
41 changed files with 315 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -784,10 +784,9 @@ static const QMap<QString, int> &vimKeyNames()
return k;
}
bool isControlModifier(const Qt::KeyboardModifiers &mods)
static bool isOnlyControlModifier(const Qt::KeyboardModifiers &mods)
{
static const int ctrl = HostOsInfo::controlModifier();
return (mods & ctrl) == ctrl;
return (mods ^ HostOsInfo::controlModifier()) == Qt::NoModifier;
}
@@ -949,7 +948,7 @@ public:
bool isControl() const
{
return isControlModifier(m_modifiers);
return isOnlyControlModifier(m_modifiers);
}
bool isControl(int c) const
@@ -2221,7 +2220,7 @@ bool FakeVimHandler::Private::wantsOverride(QKeyEvent *ev)
}
// We are interested in overriding most Ctrl key combinations.
if (isControlModifier(mods)
if (isOnlyControlModifier(mods)
&& !config(ConfigPassControlKey).toBool()
&& ((key >= Key_A && key <= Key_Z && key != Key_K)
|| key == Key_BracketLeft || key == Key_BracketRight)) {