From 60b0d5305936dda7d1fe89b5542c76dc5da54172 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Fri, 7 Jul 2017 09:13:24 +0000 Subject: Update qtwebengine and fix qtwebkit deps --- strata/qt5-tools-qtwebengine.morph | 11 +++++++++-- strata/qt5-tools-qtwebkit.morph | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/strata/qt5-tools-qtwebengine.morph b/strata/qt5-tools-qtwebengine.morph index 9c954f5f..49efe9d2 100644 --- a/strata/qt5-tools-qtwebengine.morph +++ b/strata/qt5-tools-qtwebengine.morph @@ -6,11 +6,18 @@ 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: qtwebengine repo: upstream:qt5/qtwebengine - ref: 5c4ae298b0a3d75c4c5ea8aef0595914ab25607f - unpetrify-ref: v5.6.0 + ref: 392da2b649ce669bf329b49668a69007179e4726 + unpetrify-ref: v5.9.1 build-system: qmake + build-depends: + - qtwebchannel submodules: src/3rdparty: url: upstream:qt5/qtwebengine-chromium.git diff --git a/strata/qt5-tools-qtwebkit.morph b/strata/qt5-tools-qtwebkit.morph index af337b87..bef3bd53 100644 --- a/strata/qt5-tools-qtwebkit.morph +++ b/strata/qt5-tools-qtwebkit.morph @@ -16,6 +16,8 @@ chunks: ref: d10511e0a3f655ab2b1dfebfd9c17ade151a7cfe unpetrify-ref: 5.212 build-system: qmake + build-depends: + - qtwebchanne; - name: qtwebkit-examples repo: upstream:qt5/qtwebkit-examples ref: f544b2eec0c18b7674ac4df629ae98e8cacce5c7 -- cgit v1.2.1