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