summaryrefslogtreecommitdiff
path: root/strata
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-10-15 16:11:10 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-10-15 16:11:10 +0000
commitd0bc92ffdb02214c63741271387dc097ce288c2b (patch)
treea76386a60760a636a5dc97390e9ae603b48ec528 /strata
parent7174fcddab930ae8bb9b6bd5721d7b3ead1b9ba0 (diff)
downloaddefinitions-d0bc92ffdb02214c63741271387dc097ce288c2b.tar.gz
Add qtwebkit to qt5-tools
Change-Id: I802a7b005f581a6255e78d400de30bd7522f40ed
Diffstat (limited to 'strata')
-rw-r--r--strata/qt5-tools.morph6
-rw-r--r--strata/qt5-tools/qtwebkit.morph1
2 files changed, 6 insertions, 1 deletions
diff --git a/strata/qt5-tools.morph b/strata/qt5-tools.morph
index 7fb8403e..b0ac0ba3 100644
--- a/strata/qt5-tools.morph
+++ b/strata/qt5-tools.morph
@@ -135,3 +135,9 @@ chunks:
unpetrify-ref: v5.4.0
build-depends:
- qtbase
+- name: qtwayland
+ repo: upstream:qt5/qtwayland
+ ref: baserock/genivi-5.4.0-wip
+ build-system: qmake
+ build-depends:
+ - qtbase
diff --git a/strata/qt5-tools/qtwebkit.morph b/strata/qt5-tools/qtwebkit.morph
index c9348aca..c76db433 100644
--- a/strata/qt5-tools/qtwebkit.morph
+++ b/strata/qt5-tools/qtwebkit.morph
@@ -1,6 +1,5 @@
name: qtwebkit
kind: chunk
-max-jobs: 1
configure-commands:
- QMAKEPATH=/qtwebkit.build/Tools/qmake/mkspecs qmake WebKit.pro
build-commands: