Merge remote-tracking branch 'origin/morty' into pyro

Automotive related changes left intact for pyro, as they require
further work than just a basic merge due component branching
differences etc.

* origin/morty [MERGED]:

  qt5: don't build tests by default
  qbsp: fix replace tags
  quickcompiler: update to 5.9.4 release revision
  meta-qt5: update to Qt 5.9.4 RC
  meta-qt5: update to Qt 5.9.4 snapshot
  meta-qt5: update meta layer
  poky: update revision
  ppp: remove obsolete patch
  meta-qt5: update meta layer
  internal-build: prepend mirror variables
  qtdeviceutilities: update revision
  meta-qt5: update meta layer
  poky: update revision

* origin/morty [NOT MERGED]:

  Fix license checksum due to incremented year number
  Update GammaRay revision
  multiscreen-demo: update revision and fix startup
  automotive: update revisions
  sdk: add qtapplicationmanger staticdev package
  qtivi: enable ivigenerator for toolchain
  appman: add dependency to nativesdk-qtdeclarative
  qtivi: Update to the latest version and add PACKAGECONFIG options for qtsimulator

Changes not staged for commit:
  recipes-qt/automotive/gammaray_git.bb
  recipes-qt/automotive/multiscreen-demo_git.bb
  recipes-qt/automotive/qtapplicationmanager_git.bb
  recipes-qt/automotive/qtivi_git.bb
  recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb
  recipes-qt/packagegroups/packagegroup-b2qt-automotive-qt5-toolchain-target.bb

Conflicts:
  recipes-qt/automotive/gammaray_git.bb
  recipes-qt/automotive/neptune-ui_git.bb
  recipes-qt/automotive/qtapplicationmanager_git.bb
  recipes-qt/automotive/qtivi_git.bb
  recipes-qt/qt5/qtdeviceutilities.bb
  recipes-qt/qt5/qtquickcompiler_git.bb
  scripts/manifest.xml

Task-number: QTBUG-65164
Change-Id: I98fe358aaaf55a609dc34f7b8cc65525d493ff26

1 files changed, 9 insertions, 8 deletions

diff --git a/files/qbsp/toolchain_installscript.qs b/files/qbsp/toolchain_installscript.qs
index 15e9570..4afab71 100644
--- a/files/qbsp/toolchain_installscript.qs
+++ b/files/qbsp/toolchain_installscript.qs
@@ -38,6 +38,7 @@ Component.prototype.createOperations = function()
     var device = "@MACHINE@"
     var platform = "@NAME@"
     var sysroot = "@SYSROOT@"
+    var target_sys = "@TARGET_SYS@"
     var target = "@TARGET@"
     var abi = "@ABI@"
     var installPath = "@INSTALLPATH@/toolchain"
@@ -71,8 +72,8 @@ Component.prototype.createOperations = function()
     component.addOperation("Execute",
         ["@SDKToolBinary@", "addTC",
         "--id", toolchainId + ".gcc",
-        "--name", "GCC (Boot2Qt " + platform + ")",
-        "--path", path + "/sysroots/" + hostSysroot + "/usr/bin/" + target + "/" + target + "-gcc" + executableExt,
+        "--name", "GCC (" + platform + " " + target + ")",
+        "--path", path + "/sysroots/" + hostSysroot + "/usr/bin/" + target_sys + "/" + target_sys + "-gcc" + executableExt,
         "--abi", abi,
         "--language", "1",
         "UNDOEXECUTE",
@@ -81,8 +82,8 @@ Component.prototype.createOperations = function()
     component.addOperation("Execute",
         ["@SDKToolBinary@", "addTC",
         "--id", toolchainId + ".g++",
-        "--name", "G++ (Boot2Qt " + platform + ")",
-        "--path", path + "/sysroots/" + hostSysroot + "/usr/bin/" + target + "/" + target + "-g++" + executableExt,
+        "--name", "G++ (" + platform + " " + target + ")",
+        "--path", path + "/sysroots/" + hostSysroot + "/usr/bin/" + target_sys + "/" + target_sys + "-g++" + executableExt,
         "--abi", abi,
         "--language", "2",
         "UNDOEXECUTE",
@@ -91,9 +92,9 @@ Component.prototype.createOperations = function()
     component.addOperation("Execute",
         ["@SDKToolBinary@", "addDebugger",
         "--id", debuggerId,
-        "--name", "GDB (Boot2Qt " + platform + ")",
+        "--name", "GDB (" + platform + " " + target + ")",
         "--engine", "1",
-        "--binary", path + "/sysroots/" + hostSysroot + "/usr/bin/" + target + "/" + target + "-gdb" + executableExt,
+        "--binary", path + "/sysroots/" + hostSysroot + "/usr/bin/" + target_sys + "/" + target_sys + "-gdb" + executableExt,
         "--abis", abi,
         "UNDOEXECUTE",
         "@SDKToolBinary@", "rmDebugger", "--id", debuggerId]);
@@ -101,7 +102,7 @@ Component.prototype.createOperations = function()
     component.addOperation("Execute",
         ["@SDKToolBinary@", "addQt",
          "--id", qtId,
-         "--name", "Boot2Qt %{Qt:Version} " + platform,
+         "--name", platform + " " + target,
          "--type", "Qdb.EmbeddedLinuxQt",
          "--qmake", path + "/sysroots/" + hostSysroot + "/usr/bin/qmake" + executableExt,
          "UNDOEXECUTE",
@@ -110,7 +111,7 @@ Component.prototype.createOperations = function()
     component.addOperation("Execute",
         ["@SDKToolBinary@", "addKit",
          "--id", basecomponent,
-         "--name", "Boot2Qt %{Qt:Version} " + platform,
+         "--name", platform + " " + target,
          "--mkspec", "devices/linux-oe-generic-g++",
          "--qt", qtId,
          "--debuggerid", debuggerId,