Merge remote-tracking branch 'origin/QtAS-5.12.0' into sumo

* origin/QtAS-5.12.0:

  b97117d automotive: update revisions
  4281e5b automotive: update revisions
  b344daf automotive: update neptune 3 revision
  a143fbc Use ABI flavor with QtCreator
  9ee5a7f QBSP: add correct cmake generator for windows toolchain
  8fcf3a1 meta-qt5: update revision
  0385367 Merge commit 'origin/sumo' into QtAS-5.12.0
  9a57170 automotive: update revisions

Conflicts:
  scripts/manifest.xml

Change-Id: I3064a526fd7861ea1aa0ec9b42c016c74dbc23eb

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})" \