Compiler and Debugger paths of a QBSP package are misconfigured

When opening a qbsp package built using Yocto b2qt in Qt creator, its debugger and compiler paths point at non-existing directories.
 
For instance, when building a custom qbsp for raspberry-cm3 HW with DEPLOY_CONF_NAME Raspberry Pi CM3, the debugger path becomes:
 
/home/ilangesl/Qt/5.10.0/Boot2Qt/raspberrypi-cm3/toolchain/sysroots/x86_64-pokysdk-linux/usr/bin/Raspberry Pi CM3/Raspberry Pi CM3-gdb

The path should be:

/home/ilangesl/Qt/5.10.0/Boot2Qt/raspberrypi-cm3/toolchain/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi-gdb

The bug seems to be in qbsp.bbclass.
DEPLOY_CONF_NAME  ends up being used in TARGET definition instead of TARGET_SYS.
 
Following change seems to fix the problem, but it is not known, whether it breaks something else.
 
diff --git a/classes/qbsp.bbclass b/classes/qbsp.bbclass
index db70fc9..138ccc7 100644
— a/classes/qbsp.bbclass
+++ b/classes/qbsp.bbclass
@@ -79,12 +79,11 @@ patch_installer_files() {
     fi

     sed -e "s#@NAME@#${QBSP_NAME}#" \
-        -e "s#@TARGET@#${DEPLOY_CONF_NAME}#" {color}
+        -e "s#@TARGET@#${TARGET_SYS}#" {color}
         -e "s#@VERSION@#${QBSP_VERSION}#" \
         -e "s#@RELEASEDATE@#${RELEASEDATE}#" \
         -e "s#@MACHINE@#${MACHINE}#" \
         -e "s#@SYSROOT@#${REAL_MULTIMACH_TARGET_SYS}#" \
-        -e "s#@TARGET@#${TARGET_SYS}#" {color}
         -e "s#@ABI@#${ABI}#" \
         -e "s#@INSTALLPATH@#${QBSP_INSTALL_PATH}#" \
         -e "s#@SDKPATH@#${SDKPATH}#" \