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

2 files changed, 13 insertions, 2 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})" \
diff --git a/meta-boot2qt/files/qbsp/toolchain_installscript.qs b/meta-boot2qt/files/qbsp/toolchain_installscript.qs
index 4d25bf7..32c14e0 100644
--- a/meta-boot2qt/files/qbsp/toolchain_installscript.qs
+++ b/meta-boot2qt/files/qbsp/toolchain_installscript.qs
@@ -40,7 +40,7 @@ Component.prototype.createOperations = function()
     var sysroot = "@SYSROOT@"
     var target_sys = "@TARGET_SYS@"
     var target = "@TARGET@"
-    var abi = "@ABI@"
+    var abi = "@ABI@-linux-poky-elf-@BITS@bit"
     var installPath = "@INSTALLPATH@/toolchain"
     var sdkPath = "@SDKPATH@"
     var sdkFile = "@SDKFILE@"
@@ -73,8 +73,14 @@ Component.prototype.createOperations = function()
         executableExt = ".exe";
         hostSysroot = "i686-pokysdk-mingw32";
         toolchainId = "ProjectExplorer.ToolChain.Mingw:" + component.name;
+        cmakeGenerator = "MinGW Makefiles";
     }
 
+    component.addOperation("Execute", "{0,2}",
+        ["@SDKToolBinary@", "addAbiFlavor",
+         "--flavor", "poky",
+         "--oses", "linux"]);
+
     component.addOperation("Execute",
         ["@SDKToolBinary@", "addTC",
         "--id", toolchainId + ".gcc",
@@ -111,6 +117,7 @@ Component.prototype.createOperations = function()
          "--name", platform + " " + target,
          "--type", "Qdb.EmbeddedLinuxQt",
          "--qmake", path + "/sysroots/" + hostSysroot + "/usr/bin/qmake" + executableExt,
+         "--abis", abi,
          "UNDOEXECUTE",
          "@SDKToolBinary@", "rmQt", "--id", qtId]);