Use ABI flavor with QtCreator

QtCreator 4.8 allows adding new ABI flavors that can be used
to differentiate otherwise identical tools. Using our own abi
flavor prevents QtCreator from mixing incompatible tools with
one from yocto toolchain.

Task-number: QTAUTO-793
Change-Id: Ibba6e42b25e404aff2a20a021fe7833455f0de9b
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>

1 files changed, 5 insertions, 1 deletions

diff --git a/meta-boot2qt/files/configure-qtcreator.sh b/meta-boot2qt/files/configure-qtcreator.sh
index a7ea288..6899fc3 100755
--- a/meta-boot2qt/files/configure-qtcreator.sh
+++ b/meta-boot2qt/files/configure-qtcreator.sh
@@ -30,7 +30,7 @@
 
 set -e
 
-ABI="arm-linux-generic-elf-32bit"
+ABI="arm-linux-poky-elf-32bit"
 CONFIG=""
 
 printUsage ()
@@ -107,6 +107,10 @@ if [ -n "${REMOVEONLY}" ]; then
     exit 0
 fi
 
+${SDKTOOL} addAbiFlavor \
+    --flavor poky \
+    --oses linux || true
+
 ${SDKTOOL} addTC \
     --id "ProjectExplorer.ToolChain.Gcc:${BASEID}.gcc" \
     --name "GCC (${NAME})" \