(cherry picked from commit 6959a122) Conflicts: src/plugins/debugger/gdb/gdbengine.cpp src/plugins/debugger/gdb/gdbengine.h