summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Maw <jonathan.maw@codethink.co.uk>2015-04-02 12:56:37 +0000
committerJonathan Maw <jonathan.maw@codethink.co.uk>2015-04-02 12:56:37 +0000
commitf6a77351bbd60efb62ba566afea20519ce0cd46a (patch)
treec7e5f11d216c29d102e3c6f423a3e561324469e1
parent6d06a4ab0649ccef2b38d84e6955ce6b8e7216b7 (diff)
downloaddefinitions-f6a77351bbd60efb62ba566afea20519ce0cd46a.tar.gz
WIP: Change of plan, don't use qt5-tools-jetson
Not using qt5-tools-jetson on James Thomas' advice, since qt5-tools works now, and is maintained.
-rw-r--r--strata/genivi-demo-platform.morph4
-rw-r--r--strata/qt5-tools/qtbase.morph2
2 files changed, 4 insertions, 2 deletions
diff --git a/strata/genivi-demo-platform.morph b/strata/genivi-demo-platform.morph
index d0530622..e414b56a 100644
--- a/strata/genivi-demo-platform.morph
+++ b/strata/genivi-demo-platform.morph
@@ -3,7 +3,9 @@ kind: stratum
description: Components which make up the GENIVI demo platform.
build-depends:
- morph: strata/gtk2.morph
-- morph: strata/qt5-tools-jetson.morph
+- morph: strata/qt5-tools.morph
+- morph: strata/qt5-tools-qtmultimedia.morph
+- morph: strata/qt5-tools-qtwebkit.morph
- morph: strata/enlightenment.morph
chunks:
- name: mm-common
diff --git a/strata/qt5-tools/qtbase.morph b/strata/qt5-tools/qtbase.morph
index 9b2a20c6..5002041e 100644
--- a/strata/qt5-tools/qtbase.morph
+++ b/strata/qt5-tools/qtbase.morph
@@ -1,7 +1,7 @@
name: qtbase
kind: chunk
configure-commands:
-- ./configure -v -prefix /usr -opensource -confirm-license
+- ./configure -v -prefix /usr -opensource -confirm-license -qt-xcb
build-commands:
- make
- touch /qtbase.build/src/corelib/corelib.pro