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

diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 56f083e..1aa053b 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -109,4 +109,3 @@
            path="sources/meta-smx6"
            groups="notdefault,internal"/>
 </manifest>
-