diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2017-07-05 11:15:52 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2017-07-11 15:57:42 +0000 |
| commit | fea884537f3e07181967544c4c785d3a58ca79bd (patch) | |
| tree | c455e8f7ca062c1198922384d2a8f95b7aed439b /ivi | |
| parent | 009aa6c8fb67516a14f329367d0a4942003b6a85 (diff) | |
| download | definitions-fea884537f3e07181967544c4c785d3a58ca79bd.tar.gz | |
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).
Diffstat (limited to 'ivi')
| -rw-r--r-- | ivi/strata/qt5-ivi.morph | 12 |
1 files changed, 8 insertions, 4 deletions
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 |