Conflicts: src/plugins/coreplugin/editormanager/stackededitorgroup.cpp src/plugins/debugger/gdbengine.cpp