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, 3 insertions, 2 deletions

diff --git a/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass b/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass
index f35ebfe..6278d11 100644
--- a/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass
+++ b/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass
@@ -91,7 +91,7 @@ create_qtcreator_configure_script () {
     # add qtcreator configuration script
     install -m 0755 ${B2QTBASE}/files/configure-qtcreator.sh ${SDK_OUTPUT}/${SDKPATH}
     sed -i -e '/^CONFIG=/c\CONFIG="${SDKPATH}/environment-setup-${REAL_MULTIMACH_TARGET_SYS}"' ${SDK_OUTPUT}/${SDKPATH}/configure-qtcreator.sh
-    sed -i -e '/^ABI=/c\ABI="${ABI}-linux-generic-elf-${SITEINFO_BITS}bit"' ${SDK_OUTPUT}/${SDKPATH}/configure-qtcreator.sh
+    sed -i -e '/^ABI=/c\ABI="${ABI}-linux-poky-elf-${SITEINFO_BITS}bit"' ${SDK_OUTPUT}/${SDKPATH}/configure-qtcreator.sh
 }
 
 create_qtcreator_configure_script_sdkmingw32 () {
diff --git a/meta-boot2qt/classes/qbsp.bbclass b/meta-boot2qt/classes/qbsp.bbclass
index fbfd266..d61e12b 100644
--- a/meta-boot2qt/classes/qbsp.bbclass
+++ b/meta-boot2qt/classes/qbsp.bbclass
@@ -27,7 +27,7 @@
 ##
 ############################################################################
 
-inherit meta nopackages abi-arch
+inherit meta nopackages abi-arch siteinfo
 
 FILESEXTRAPATHS_prepend := "${B2QTBASE}/files/qbsp:"
 
@@ -87,6 +87,7 @@ patch_installer_files() {
         -e "s#@SYSROOT@#${REAL_MULTIMACH_TARGET_SYS}#" \
         -e "s#@TARGET_SYS@#${TARGET_SYS}#" \
         -e "s#@ABI@#${ABI}#" \
+        -e "s#@BITS@#${SITEINFO_BITS}#" \
         -e "s#@INSTALLPATH@#${QBSP_INSTALL_PATH}#" \
         -e "s#@SDKPATH@#${SDKPATH}#" \
         -e "s#@SDKFILE@#${SDK_NAME}#" \