Merge remote branch 'origin/2.0'

Conflicts:
	README
	doc/qt-html-templates.qdocconf
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	src/app/Info.plist
	src/plugins/bineditor/BinEditor.pluginspec
	src/plugins/bookmarks/Bookmarks.pluginspec
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
	src/plugins/coreplugin/Core.pluginspec
	src/plugins/coreplugin/coreconstants.h
	src/plugins/cpaster/CodePaster.pluginspec
	src/plugins/cppeditor/CppEditor.pluginspec
	src/plugins/cpptools/CppTools.pluginspec
	src/plugins/cvs/CVS.pluginspec
	src/plugins/debugger/Debugger.pluginspec
	src/plugins/designer/Designer.pluginspec
	src/plugins/fakevim/FakeVim.pluginspec
	src/plugins/find/Find.pluginspec
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
	src/plugins/git/ScmGit.pluginspec
	src/plugins/helloworld/HelloWorld.pluginspec
	src/plugins/help/Help.pluginspec
	src/plugins/locator/Locator.pluginspec
	src/plugins/mercurial/Mercurial.pluginspec
	src/plugins/perforce/Perforce.pluginspec
	src/plugins/projectexplorer/ProjectExplorer.pluginspec
	src/plugins/qmldesigner/QmlDesigner.pluginspec
	src/plugins/qmlinspector/QmlInspector.pluginspec
	src/plugins/qmljseditor/QmlJSEditor.pluginspec
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/regexp/RegExp.pluginspec
	src/plugins/resourceeditor/ResourceEditor.pluginspec
	src/plugins/snippets/Snippets.pluginspec
	src/plugins/subversion/Subversion.pluginspec
	src/plugins/texteditor/TextEditor.pluginspec
	src/plugins/vcsbase/VCSBase.pluginspec
	src/plugins/welcome/Welcome.pluginspec

src/plugins/fakevim/fakevimhandler.cpp

@@ -351,6 +351,12 @@ public:
     Input(int k, int m, const QString &t)
         : m_key(k), m_modifiers(m), m_text(t)
     {
+        // On Mac, QKeyEvent::text() returns non-empty strings for
+        // cursor keys. This breaks some of the logic later on
+        // relying on text() being empty for "special" keys.
+        // FIXME: Check the real conditions.
+        if (m_text.size() == 1 && m_text.at(0).unicode() < ' ')
+            m_text.clear();
         // m_xkey is only a cache.
         m_xkey = (m_text.size() == 1 ? m_text.at(0).unicode() : m_key);
     }
@@ -929,7 +935,8 @@ bool FakeVimHandler::Private::wantsOverride(QKeyEvent *ev)
         if (m_subsubmode == SearchSubSubMode)
             return true;
         // Not sure this feels good. People often hit Esc several times
-        if (isNoVisualMode() && m_mode == CommandMode)
+        if (isNoVisualMode() && m_mode == CommandMode
+               && m_opcount.isEmpty() && m_mvcount.isEmpty())
             return false;
         return true;
     }