From 2db6ca095b41f9dd62bcae4591a87d53343ccab8 Mon Sep 17 00:00:00 2001
From: Jonathan Maw <jonathan.maw@codethink.co.uk>
Date: Fri, 17 Apr 2015 16:49:48 +0000
Subject: Revert to qt5.4 and use the ivi-layout patch to qtwayland

Note: This will break support for gstreamer 1.0
---
 strata/qt5-tools-qtmultimedia.morph |  3 +--
 strata/qt5-tools-qtwebkit.morph     |  9 +++----
 strata/qt5-tools.morph              | 54 +++++++++++++------------------------
 3 files changed, 22 insertions(+), 44 deletions(-)

diff --git a/strata/qt5-tools-qtmultimedia.morph b/strata/qt5-tools-qtmultimedia.morph
index 40de1d9e..04398d9f 100644
--- a/strata/qt5-tools-qtmultimedia.morph
+++ b/strata/qt5-tools-qtmultimedia.morph
@@ -8,5 +8,4 @@ chunks:
 - name: qtmultimedia
   morph: strata/qt5-tools/qtmultimedia.morph
   repo: upstream:qt5/qtmultimedia
-  ref: dbcf44247d41fa456329da30ae378a69de19e3cd
-  unpetrify-ref: "5.5"
+  ref: v5.4.0
diff --git a/strata/qt5-tools-qtwebkit.morph b/strata/qt5-tools-qtwebkit.morph
index dee0c49a..7dadf168 100644
--- a/strata/qt5-tools-qtwebkit.morph
+++ b/strata/qt5-tools-qtwebkit.morph
@@ -14,21 +14,18 @@ chunks:
 - name: qtwebkit-examples
   morph: strata/qt5-tools/qtwebkit-examples.morph
   repo: upstream:qt5/qtwebkit-examples
-  ref: e96fa2b3bad65ebe3415920cd7820966d89f2d6c
-  unpetrify-ref: "5.5"
+  ref: v5.4.0
   build-depends:
   - qtwebkit
 - name: qttools
   morph: strata/qt5-tools/qttools.morph
   repo: upstream:qt5/qttools
-  ref: d6e36401ae68e8e963f1c0d2543f587245e0108b
-  unpetrify-ref: "5.5"
+  ref: v5.4.0
   build-depends:
   - qtwebkit
 - name: qttranslations
   morph: strata/qt5-tools/qttranslations.morph
   repo: upstream:qt5/qttranslations
-  ref: 408146a45cf9026e95666af626a90f33d890db34
-  unpetrify-ref: "5.5"
+  ref: v5.4.0
   build-depends:
   - qttools
diff --git a/strata/qt5-tools.morph b/strata/qt5-tools.morph
index 4571a53d..d7f89524 100644
--- a/strata/qt5-tools.morph
+++ b/strata/qt5-tools.morph
@@ -13,45 +13,39 @@ chunks:
 - name: qtbase
   morph: strata/qt5-tools/qtbase.morph
   repo: upstream:qt5/qtbase
-  ref: ed42bf8c0562ce625ebf7bb3e6b0624da5a1d7ec
-  unpetrify-ref: "5.5"
+  ref: v5.4.0
   build-depends:
   - icu
 - name: qtsvg
   morph: strata/qt5-tools/qtsvg.morph
   repo: upstream:qt5/qtsvg
-  ref: b725b5fd9158d95f3693a06425924271ee4b4239
-  unpetrify-ref: "5.5"
+  ref: v5.4.0
   build-depends:
   - qtbase
 - name: qtscript
   morph: strata/qt5-tools/qtscript.morph
   repo: upstream:qt5/qtscript
-  ref: 48a184a7304ac34bbb7942b19b12d2cc8cad6174
-  unpetrify-ref: "5.5"
+  ref: v5.4.0
   build-depends:
   - qtbase
 - name: qtdeclarative
   morph: strata/qt5-tools/qtdeclarative.morph
   repo: upstream:qt5/qtdeclarative
-  ref: af9e21cd91abcff9e084161cb7ed15fbedc8f931
-  unpetrify-ref: "5.5"
+  ref: v5.4.0
   build-depends:
   - qtbase
   - qtscript
 - name: qtquick1
   morph: strata/qt5-tools/qtquick1.morph
   repo: upstream:qt5/qtquick1
-  ref: 30405c50a521146f2dda49916f160ab722316a82
-  unpetrify-ref: "5.5"
+  ref: v5.4.0
   build-depends:
   - qtbase
   - qtscript
 - name: qt3d
   morph: strata/qt5-tools/qt3d.morph
   repo: upstream:qt5/qt3d
-  ref: c82207d54c76d8b66be010bfa63e45f9507891fa
-  unpetrify-ref: "5.5"
+  ref: v5.4.0
   build-depends:
   - qtbase
   - qtscript
@@ -59,85 +53,73 @@ chunks:
 - name: qtquickcontrols
   morph: strata/qt5-tools/qtquickcontrols.morph
   repo: upstream:qt5/qtquickcontrols
-  ref: f75a2542eb64e66018b4c0b6eb07f593c4baf095
-  unpetrify-ref: "5.5"
+  ref: v5.4.0
   build-depends:
   - qtbase
   - qtdeclarative
 - name: qtsensors
   morph: strata/qt5-tools/qtsensors.morph
   repo: upstream:qt5/qtsensors
-  ref: 19e41c59771bda6e64432a6e007afe76361ae3ef
-  unpetrify-ref: "5.5"
+  ref: v5.4.0
   build-depends:
   - qtbase
 - name: qtserialport
   morph: strata/qt5-tools/qtserialport.morph
   repo: upstream:qt5/qtserialport
-  ref: 801198fab9f6e29b1cd56a8820606f616e3d256e
-  unpetrify-ref: "5.5"
+  ref: v5.4.0
   build-depends:
   - qtbase
 - name: qtx11extras
   morph: strata/qt5-tools/qtx11extras.morph
   repo: upstream:qt5/qtx11extras
-  ref: fbbd39ea7b005e70e32c6ed284c0779ce9958247
-  unpetrify-ref: "5.5"
+  ref: v5.4.0
   build-depends:
   - qtbase
 - name: qtxmlpatterns
   morph: strata/qt5-tools/qtxmlpatterns.morph
   repo: upstream:qt5/qtxmlpatterns
-  ref: 5e53b39e6a2dda3387dda9a810c4bfed8752ad6d
-  unpetrify-ref: "5.5"
+  ref: v5.4.0
   build-depends:
   - qtbase
 - name: qtdoc
   morph: strata/qt5-tools/qtdoc.morph
   repo: upstream:qt5/qtdoc
-  ref: 5cd576ea736d94cf0c95d4325d6367873ad338df
-  unpetrify-ref: "5.5"
+  ref: v5.4.0
   build-depends:
   - qtbase
 - name: qtgraphicaleffects
   morph: strata/qt5-tools/qtgraphicaleffects.morph
   repo: upstream:qt5/qtgraphicaleffects
-  ref: 4ee79d3eb4baef9e5b2a3d263f002a24184d0e6e
-  unpetrify-ref: "5.5"
+  ref: v5.4.0
   build-depends:
   - qtbase
   - qtdeclarative
 - name: qtimageformats
   morph: strata/qt5-tools/qtimageformats.morph
   repo: upstream:qt5/qtimageformats
-  ref: 5b8737723a39f7529422bb3832d5b6ac62762bec
-  unpetrify-ref: "5.5"
+  ref: v5.4.0
   build-depends:
   - qtbase
 - name: qtconnectivity
   morph: strata/qt5-tools/qtconnectivity.morph
   repo: upstream:qt5/qtconnectivity
-  ref: 0c626f290111a0dfed2e0faae98afb1b0ad9943c
-  unpetrify-ref: "5.5"
+  ref: v5.4.0
   build-depends:
   - qtbase
 - name: qtlocation
   morph: strata/qt5-tools/qtlocation.morph
   repo: upstream:qt5/qtlocation
-  ref: 6915abd48a911a51b0625688ba70009b919f7882
-  unpetrify-ref: "5.5"
+  ref: v5.4.0
   build-depends:
   - qtbase
 - name: qtwebsockets
   morph: strata/qt5-tools/qtwebsockets.morph
   repo: upstream:qt5/qtwebsockets
-  ref: bf0a3b6c6b0dc35420655e6325dc3529da7d40b1
-  unpetrify-ref: "5.5"
+  ref: v5.4.0
   build-depends:
   - qtbase
 - name: qtwayland
   repo: upstream:qt5/qtwayland
-  ref: d5500d96005c2d617e14a43b41462b48e59fdd65
-  unpetrify-ref: "5.5"
+  ref: baserock/genivi-5.4.0-wip
   build-depends:
   - qtbase
-- 
cgit v1.2.1