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

2 files changed, 3 insertions, 3 deletions

diff --git a/classes/internal-build.bbclass b/classes/internal-build.bbclass
index 0f12a78..64c07bf 100644
--- a/classes/internal-build.bbclass
+++ b/classes/internal-build.bbclass
@@ -35,8 +35,8 @@ python enable_internal_build () {
         return
 
     e.data.setVar('ENABLE_QTQUICKCOMPILER', "1")
-    e.data.setVar('SSTATE_MIRRORS', "file://.* http://yocto-cache.intra.qt.io/sstate-caches/${DISTRO_CODENAME}/PATH")
-    e.data.setVar('PREMIRRORS', "\
+    e.data.prependVar('SSTATE_MIRRORS', "file://.* http://yocto-cache.intra.qt.io/sstate-caches/${DISTRO_CODENAME}/PATH")
+    e.data.prependVar('PREMIRRORS', "\
         ftp://.*/.*   http://yocto-cache.intra.qt.io/sources/ \n \
         http://.*/.*  http://yocto-cache.intra.qt.io/sources/ \n \
         https://.*/.* http://yocto-cache.intra.qt.io/sources/ \n \
diff --git a/classes/qbsp.bbclass b/classes/qbsp.bbclass
index db70fc9..da790bf 100644
--- a/classes/qbsp.bbclass
+++ b/classes/qbsp.bbclass
@@ -84,7 +84,7 @@ patch_installer_files() {
         -e "s#@RELEASEDATE@#${RELEASEDATE}#" \
         -e "s#@MACHINE@#${MACHINE}#" \
         -e "s#@SYSROOT@#${REAL_MULTIMACH_TARGET_SYS}#" \
-        -e "s#@TARGET@#${TARGET_SYS}#" \
+        -e "s#@TARGET_SYS@#${TARGET_SYS}#" \
         -e "s#@ABI@#${ABI}#" \
         -e "s#@INSTALLPATH@#${QBSP_INSTALL_PATH}#" \
         -e "s#@SDKPATH@#${SDKPATH}#" \