Conflicts:
	src/plugins/qmlinspector/qmlinspectorplugin.cpp
	src/plugins/qmljseditor/qmljseditor.h
	src/plugins/qmljsinspector/QmlJSInspector.pluginspec
	src/tools/qml/qmlobserver/editor/resizehandleitem.h