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 /strata/qt5-tools-qtwebkit.morph | |
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 'strata/qt5-tools-qtwebkit.morph')
-rw-r--r-- | strata/qt5-tools-qtwebkit.morph | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/strata/qt5-tools-qtwebkit.morph b/strata/qt5-tools-qtwebkit.morph index 5d298e4d..012834ff 100644 --- a/strata/qt5-tools-qtwebkit.morph +++ b/strata/qt5-tools-qtwebkit.morph @@ -6,29 +6,36 @@ build-depends: - morph: strata/qt5-tools.morph - morph: strata/ruby.morph chunks: +- name: qtwebchannel + repo: upstream:qt5/qtwebchannel + ref: 392da2b649ce669bf329b49668a69007179e4726 + unpetrify-ref: 5.9.1 + build-system: qmake - name: qtwebkit repo: upstream:qt5/qtwebkit - ref: 7205faf1a546a690f68176989100109e9a3335b7 - unpetrify-ref: '5.6' + ref: d10511e0a3f655ab2b1dfebfd9c17ade151a7cfe + unpetrify-ref: '5.212' build-system: qmake + build-depends: + - qtwebchannel - name: qtwebkit-examples repo: upstream:qt5/qtwebkit-examples - ref: 1b9a0fc9d1ded4f4f11b04eb0bb7d1de82d6eb34 - unpetrify-ref: '5.6' + ref: f544b2eec0c18b7674ac4df629ae98e8cacce5c7 + unpetrify-ref: 5.9.1 build-system: qmake build-depends: - qtwebkit - name: qttools repo: upstream:qt5/qttools - ref: 9904992dc4eb9a5958fcfbac238374ff38498143 - unpetrify-ref: v5.6.0 + ref: dfda6f14b3e210a33b71ef1c6fa3c75a9c866cce + unpetrify-ref: v5.9.1 build-system: qmake build-depends: - qtwebkit - name: qttranslations repo: upstream:qt5/qttranslations - ref: 41d212290c3822b8eef151785d89ac5f5b246bde - unpetrify-ref: v5.6.0 + ref: ad5a9af215e2b1276893490c7fe92de39cc25005 + unpetrify-ref: v5.9.1 build-system: qmake build-depends: - qttools |