(cherry picked from commit bf077800) Conflicts: src/plugins/debugger/debuggerplugin.cpp src/plugins/debugger/gdb/gdboptionspage.ui
(cherry picked from commit bf077800) Conflicts: src/plugins/debugger/debuggerplugin.cpp src/plugins/debugger/gdb/gdboptionspage.ui