Conflicts: src/plugins/qmlinspector/qmlinspector.cpp src/plugins/qmljsinspector/qmljsinspectorcontext.cpp src/plugins/qmljsinspector/qmljsinspectorplugin.cpp