Merge remote-tracking branch 'origin/2.3'

Conflicts:
	qtcreator.pri

Change-Id: Iaca68084799ae9aec257742c395609d6e8aa72cd

diff --cc src/libs/qmljsdebugclient/qdeclarativedebugclient.cpp
Simple merge

diff --cc src/plugins/debugger/debuggerplugin.cpp
Simple merge

diff --cc src/plugins/debugger/qml/qmlcppengine.cpp
Simple merge

diff --cc src/plugins/fakevim/fakevimhandler.cpp
Simple merge

diff --cc src/plugins/fakevim/fakevimplugin.cpp
Simple merge