From 3ea85ed2cd7fda52e9e1ae59e064d27a1cc3a812 Mon Sep 17 00:00:00 2001 From: Jonathan Maw Date: Thu, 2 Apr 2015 12:56:40 +0000 Subject: Update qt5-tools to qt 5.5 --- strata/qt5-tools-qtmultimedia.morph | 8 ++--- strata/qt5-tools-qtwebkit.morph | 16 ++++----- strata/qt5-tools.morph | 68 ++++++++++++++++++------------------- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/strata/qt5-tools-qtmultimedia.morph b/strata/qt5-tools-qtmultimedia.morph index d30acdcc..40de1d9e 100644 --- a/strata/qt5-tools-qtmultimedia.morph +++ b/strata/qt5-tools-qtmultimedia.morph @@ -3,10 +3,10 @@ kind: stratum description: Qt5 QtMultimedia Development Libraries and Tools build-depends: - morph: strata/qt5-tools.morph -- morph: strata/multimedia-gstreamer-0.10.morph +- morph: strata/multimedia-gstreamer.morph chunks: - name: qtmultimedia - morph: strata/qt5-tools/qtmultimedia-gstreamer.morph + morph: strata/qt5-tools/qtmultimedia.morph repo: upstream:qt5/qtmultimedia - ref: 8b1ee1724071cc4bbe8cefe195e375ef583d9d7f - unpetrify-ref: v5.4.0 + ref: dbcf44247d41fa456329da30ae378a69de19e3cd + unpetrify-ref: "5.5" diff --git a/strata/qt5-tools-qtwebkit.morph b/strata/qt5-tools-qtwebkit.morph index 89039789..c90dbc8e 100644 --- a/strata/qt5-tools-qtwebkit.morph +++ b/strata/qt5-tools-qtwebkit.morph @@ -9,26 +9,26 @@ chunks: - name: qtwebkit morph: strata/qt5-tools/qtwebkit.morph repo: upstream:qt5/qtwebkit - ref: 5d43584babfb43b99159f702160d010778d2190a - unpetrify-ref: v5.4.0 + ref: 5d5b80aa50ba3a3082819ec0c1f60cdaca82bbde + unpetrify-ref: "5.5" - name: qtwebkit-examples morph: strata/qt5-tools/qtwebkit-examples.morph repo: upstream:qt5/qtwebkit-examples - ref: 70bd4d5253f134bf48a30544030bb832f1eba8b3 - unpetrify-ref: v5.4.0 + ref: e96fa2b3bad65ebe3415920cd7820966d89f2d6c + unpetrify-ref: "5.5" build-depends: - qtwebkit - name: qttools morph: strata/qt5-tools/qttools.morph repo: upstream:qt5/qttools - ref: 5060a0ec7dcb26826b19eefbd6063efcbde6101f - unpetrify-ref: v5.4.0 + ref: d6e36401ae68e8e963f1c0d2543f587245e0108b + unpetrify-ref: "5.5" build-depends: - qtwebkit - name: qttranslations morph: strata/qt5-tools/qttranslations.morph repo: upstream:qt5/qttranslations - ref: 3aad4ab4718d4bf952275a07e406e93eb6a22eed - unpetrify-ref: v5.4.0 + ref: 408146a45cf9026e95666af626a90f33d890db34 + unpetrify-ref: "5.5" build-depends: - qttools diff --git a/strata/qt5-tools.morph b/strata/qt5-tools.morph index 0bd55160..4571a53d 100644 --- a/strata/qt5-tools.morph +++ b/strata/qt5-tools.morph @@ -13,45 +13,45 @@ chunks: - name: qtbase morph: strata/qt5-tools/qtbase.morph repo: upstream:qt5/qtbase - ref: 5367fa356233da4c0f28172a8f817791525f5457 - unpetrify-ref: v5.4.0 + ref: ed42bf8c0562ce625ebf7bb3e6b0624da5a1d7ec + unpetrify-ref: "5.5" build-depends: - icu - name: qtsvg morph: strata/qt5-tools/qtsvg.morph repo: upstream:qt5/qtsvg - ref: eece19e62638409b479cabcbb985978d61d84307 - unpetrify-ref: v5.4.0 + ref: b725b5fd9158d95f3693a06425924271ee4b4239 + unpetrify-ref: "5.5" build-depends: - qtbase - name: qtscript morph: strata/qt5-tools/qtscript.morph repo: upstream:qt5/qtscript - ref: 1371263991489f11774250aa609ace0b12415186 - unpetrify-ref: v5.4.0 + ref: 48a184a7304ac34bbb7942b19b12d2cc8cad6174 + unpetrify-ref: "5.5" build-depends: - qtbase - name: qtdeclarative morph: strata/qt5-tools/qtdeclarative.morph repo: upstream:qt5/qtdeclarative - ref: fdf004803d036583f58ceb832803cfe39c6ba6d8 - unpetrify-ref: v5.4.0 + ref: af9e21cd91abcff9e084161cb7ed15fbedc8f931 + unpetrify-ref: "5.5" build-depends: - qtbase - qtscript - name: qtquick1 morph: strata/qt5-tools/qtquick1.morph repo: upstream:qt5/qtquick1 - ref: 1f92491bd95abc642dcd882846884a5271c8ba16 - unpetrify-ref: v5.4.0 + ref: 30405c50a521146f2dda49916f160ab722316a82 + unpetrify-ref: "5.5" build-depends: - qtbase - qtscript - name: qt3d morph: strata/qt5-tools/qt3d.morph repo: upstream:qt5/qt3d - ref: bdb98baf8253c69949a8c259369203da9ffb269c - unpetrify-ref: baserock/morph + ref: c82207d54c76d8b66be010bfa63e45f9507891fa + unpetrify-ref: "5.5" build-depends: - qtbase - qtscript @@ -59,80 +59,80 @@ chunks: - name: qtquickcontrols morph: strata/qt5-tools/qtquickcontrols.morph repo: upstream:qt5/qtquickcontrols - ref: ea099e341b5f8845be56f81b22e44a8b6cb227a2 - unpetrify-ref: v5.4.0 + ref: f75a2542eb64e66018b4c0b6eb07f593c4baf095 + unpetrify-ref: "5.5" build-depends: - qtbase - qtdeclarative - name: qtsensors morph: strata/qt5-tools/qtsensors.morph repo: upstream:qt5/qtsensors - ref: 10702cfa8ce803e0911306284c246a879d865f1d - unpetrify-ref: v5.4.0 + ref: 19e41c59771bda6e64432a6e007afe76361ae3ef + unpetrify-ref: "5.5" build-depends: - qtbase - name: qtserialport morph: strata/qt5-tools/qtserialport.morph repo: upstream:qt5/qtserialport - ref: 9aef6c3c8ff97b7998bdd813f7c7f3d845b2a53f - unpetrify-ref: v5.4.0 + ref: 801198fab9f6e29b1cd56a8820606f616e3d256e + unpetrify-ref: "5.5" build-depends: - qtbase - name: qtx11extras morph: strata/qt5-tools/qtx11extras.morph repo: upstream:qt5/qtx11extras - ref: a21bbb45019e1bbc7b583811ff2e84757082a01a - unpetrify-ref: v5.4.0 + ref: fbbd39ea7b005e70e32c6ed284c0779ce9958247 + unpetrify-ref: "5.5" build-depends: - qtbase - name: qtxmlpatterns morph: strata/qt5-tools/qtxmlpatterns.morph repo: upstream:qt5/qtxmlpatterns - ref: 2e8b90b33d1d8dce4acdb6a116a227f2a5d3e044 - unpetrify-ref: v5.4.0 + ref: 5e53b39e6a2dda3387dda9a810c4bfed8752ad6d + unpetrify-ref: "5.5" build-depends: - qtbase - name: qtdoc morph: strata/qt5-tools/qtdoc.morph repo: upstream:qt5/qtdoc - ref: 251f5eaa2dae740c0d0217893038a3f5bab2bca3 - unpetrify-ref: v5.4.0 + ref: 5cd576ea736d94cf0c95d4325d6367873ad338df + unpetrify-ref: "5.5" build-depends: - qtbase - name: qtgraphicaleffects morph: strata/qt5-tools/qtgraphicaleffects.morph repo: upstream:qt5/qtgraphicaleffects - ref: 9e9600d92224084f7942a6bd83b926c630a29747 - unpetrify-ref: v5.4.0 + ref: 4ee79d3eb4baef9e5b2a3d263f002a24184d0e6e + unpetrify-ref: "5.5" build-depends: - qtbase - qtdeclarative - name: qtimageformats morph: strata/qt5-tools/qtimageformats.morph repo: upstream:qt5/qtimageformats - ref: fdc7026fb7d098abbf135fd5e7d2cf00884f9235 - unpetrify-ref: v5.4.0 + ref: 5b8737723a39f7529422bb3832d5b6ac62762bec + unpetrify-ref: "5.5" build-depends: - qtbase - name: qtconnectivity morph: strata/qt5-tools/qtconnectivity.morph repo: upstream:qt5/qtconnectivity - ref: 5d405d07fb51502d0bfab08f4d74aa5eba365bab - unpetrify-ref: v5.4.0 + ref: 0c626f290111a0dfed2e0faae98afb1b0ad9943c + unpetrify-ref: "5.5" build-depends: - qtbase - name: qtlocation morph: strata/qt5-tools/qtlocation.morph repo: upstream:qt5/qtlocation - ref: 7791dd790d2b15751b703db70a5fceb31d3fd99f - unpetrify-ref: v5.4.0 + ref: 6915abd48a911a51b0625688ba70009b919f7882 + unpetrify-ref: "5.5" build-depends: - qtbase - name: qtwebsockets morph: strata/qt5-tools/qtwebsockets.morph repo: upstream:qt5/qtwebsockets - ref: d1c9ede19976767393fe5db2f396c0c18d6fbced - unpetrify-ref: v5.4.0 + ref: bf0a3b6c6b0dc35420655e6325dc3529da7d40b1 + unpetrify-ref: "5.5" build-depends: - qtbase - name: qtwayland -- cgit v1.2.1