From fea884537f3e07181967544c4c785d3a58ca79bd Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Wed, 5 Jul 2017 11:15:52 +0000
Subject: Update all Qt components to latest (5.9.1)

This is to fix build issues with GCC 7 in QtWebKit and QtIvi.

Note that the GENIVI IVI shell patches were merged upstream in QtWayland
commit f144f0f71f1b75df92 so we should no longer need to use a fork of
that component.

qtwebengine 5.9 requires GNU gzip to build -- the `grit` tool (Google
Resource and Internationalization Tool) expects to be able to call `gzip
--rsyncable` which is a feature only provided by GNU gzip. I used
'master' of gzip.git because otherwise the build of the embedded gnulib
components fail with GCC 7 (due to warnings and -Werror).
---
 ivi/strata/qt5-ivi.morph | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'ivi')

diff --git a/ivi/strata/qt5-ivi.morph b/ivi/strata/qt5-ivi.morph
index 360faa39..7032c290 100644
--- a/ivi/strata/qt5-ivi.morph
+++ b/ivi/strata/qt5-ivi.morph
@@ -4,14 +4,18 @@ description: Qt5 IVI stratum
 build-depends:
 - morph: strata/ruby.morph
 - morph: strata/qt5-tools.morph
+- morph: strata/qt5-tools-qtmultimedia.morph
 chunks:
 - name: qtapplicationmanager
   morph: ivi/strata/qt5-ivi/qtapplicationmanager.morph
   repo: upstream:qt5/qtapplicationmanager
-  ref: fb9670e9e381aa391e5fe3eccd76db0f7b866abb
-  unpetrify-ref: "5.7"
+  ref: 3334cc42fcbc15dc75a0e247578e714399cd939f
+  unpetrify-ref: "5.9"
 - name: qtivi
   repo: upstream:qt5/qtivi
-  ref: 36616e36cb1f0b30aa9ca7977af7a5b682689f7a
-  unpetrify-ref: "5.7"
+  ref: 107832b9e27319e9104e3b68d76a4d0f326567f6
+  unpetrify-ref: dev
   build-system: qmake
+  submodules:
+    src/3rdparty/qface:
+      url: upstream:qt5/qtivi-qface
-- 
cgit v1.2.1