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, 7 insertions, 1 deletions

diff --git a/meta-boot2qt/files/qbsp/toolchain_installscript.qs b/meta-boot2qt/files/qbsp/toolchain_installscript.qs
index 8de238b..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@"
@@ -76,6 +76,11 @@ Component.prototype.createOperations = function()
         cmakeGenerator = "MinGW Makefiles";
     }
 
+    component.addOperation("Execute", "{0,2}",
+        ["@SDKToolBinary@", "addAbiFlavor",
+         "--flavor", "poky",
+         "--oses", "linux"]);
+
     component.addOperation("Execute",
         ["@SDKToolBinary@", "addTC",
         "--id", toolchainId + ".gcc",
@@ -112,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]);