summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Thomas <james.thomas@codethink.co.uk>2015-02-20 15:31:13 (GMT)
committerJames Thomas <james.thomas@codethink.co.uk>2015-03-25 13:48:18 (GMT)
commit18dbfa0296dc1ce8344c4a9767e22e12fa179ab2 (patch)
tree3a5d554d7304039a6afbeea60823d519766a639c
parentfe35e6882eb104a4dd7dfadfb85b04cfc88ee2a5 (diff)
downloaddefinitions-baserock/james/qt5-upgrade.tar.gz
Update qt5 to v5.4.0baserock/james/qt5-upgrade
-rw-r--r--strata/qt5-tools-qtmultimedia.morph4
-rw-r--r--strata/qt5-tools-qtwebkit.morph20
-rw-r--r--strata/qt5-tools.morph71
3 files changed, 47 insertions, 48 deletions
diff --git a/strata/qt5-tools-qtmultimedia.morph b/strata/qt5-tools-qtmultimedia.morph
index 92bfcde..d30acdc 100644
--- a/strata/qt5-tools-qtmultimedia.morph
+++ b/strata/qt5-tools-qtmultimedia.morph
@@ -8,5 +8,5 @@ chunks:
- name: qtmultimedia
morph: strata/qt5-tools/qtmultimedia-gstreamer.morph
repo: upstream:qt5/qtmultimedia
- ref: b3c2dca466042cf362ffb8d803bf05c9b8a0f95f
- unpetrify-ref: v5.3.2
+ ref: 8b1ee1724071cc4bbe8cefe195e375ef583d9d7f
+ unpetrify-ref: v5.4.0
diff --git a/strata/qt5-tools-qtwebkit.morph b/strata/qt5-tools-qtwebkit.morph
index e5338d7..8903978 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: 13f80d34ae84c3231118c8013beee55badab8929
- unpetrify-ref: v5.3.2
+ ref: 5d43584babfb43b99159f702160d010778d2190a
+ unpetrify-ref: v5.4.0
- name: qtwebkit-examples
morph: strata/qt5-tools/qtwebkit-examples.morph
repo: upstream:qt5/qtwebkit-examples
- ref: bce5056b9e16a943357e362455a46685d3f22093
- unpetrify-ref: v5.3.2
+ ref: 70bd4d5253f134bf48a30544030bb832f1eba8b3
+ unpetrify-ref: v5.4.0
build-depends:
- qtwebkit
- name: qttools
morph: strata/qt5-tools/qttools.morph
repo: upstream:qt5/qttools
- ref: 8c79a098b8b7da4832ebca1884ee833a2c2078a7
- unpetrify-ref: v5.3.2
- build-depends:
+ ref: 5060a0ec7dcb26826b19eefbd6063efcbde6101f
+ unpetrify-ref: v5.4.0
+ build-depends:
- qtwebkit
- name: qttranslations
morph: strata/qt5-tools/qttranslations.morph
repo: upstream:qt5/qttranslations
- ref: cf4d6f7e73bb410ed0aa3d64dffb2b6b242cdfe0
- unpetrify-ref: v5.3.2
- build-depends:
+ ref: 3aad4ab4718d4bf952275a07e406e93eb6a22eed
+ unpetrify-ref: v5.4.0
+ build-depends:
- qttools
diff --git a/strata/qt5-tools.morph b/strata/qt5-tools.morph
index dbda3a2..7fb8403 100644
--- a/strata/qt5-tools.morph
+++ b/strata/qt5-tools.morph
@@ -13,37 +13,37 @@ chunks:
- name: qtbase
morph: strata/qt5-tools/qtbase.morph
repo: upstream:qt5/qtbase
- ref: 05670f586ffe05425b7542a27fcca31bddf231aa
- unpetrify-ref: v5.3.2
+ ref: 5367fa356233da4c0f28172a8f817791525f5457
+ unpetrify-ref: v5.4.0
build-depends:
- icu
- name: qtsvg
morph: strata/qt5-tools/qtsvg.morph
repo: upstream:qt5/qtsvg
- ref: 35a2f0880831d38c60d2b4820dac808f48f6f3a8
- unpetrify-ref: v5.3.2
+ ref: eece19e62638409b479cabcbb985978d61d84307
+ unpetrify-ref: v5.4.0
build-depends:
- qtbase
- name: qtscript
morph: strata/qt5-tools/qtscript.morph
repo: upstream:qt5/qtscript
- ref: 71f6dee8791c95fd862ca3651d7f4b7d6b9f440e
- unpetrify-ref: v5.3.2
+ ref: 1371263991489f11774250aa609ace0b12415186
+ unpetrify-ref: v5.4.0
build-depends:
- qtbase
- name: qtdeclarative
morph: strata/qt5-tools/qtdeclarative.morph
repo: upstream:qt5/qtdeclarative
- ref: a67aa6abc6a406b00ef58a7e07fd39012bfa3eb1
- unpetrify-ref: v5.3.2
+ ref: fdf004803d036583f58ceb832803cfe39c6ba6d8
+ unpetrify-ref: v5.4.0
build-depends:
- qtbase
- qtscript
- name: qtquick1
morph: strata/qt5-tools/qtquick1.morph
repo: upstream:qt5/qtquick1
- ref: 8e7fa2b5aa2e2e4371c4b73926d0e6ad2ebdbd96
- unpetrify-ref: v5.3.2
+ ref: 1f92491bd95abc642dcd882846884a5271c8ba16
+ unpetrify-ref: v5.4.0
build-depends:
- qtbase
- qtscript
@@ -59,80 +59,79 @@ chunks:
- name: qtquickcontrols
morph: strata/qt5-tools/qtquickcontrols.morph
repo: upstream:qt5/qtquickcontrols
- ref: bc91574cca8b6f24968ab4e1cc11fe1fd10f3061
- unpetrify-ref: v5.3.2
+ ref: ea099e341b5f8845be56f81b22e44a8b6cb227a2
+ unpetrify-ref: v5.4.0
build-depends:
- qtbase
- qtdeclarative
- name: qtsensors
morph: strata/qt5-tools/qtsensors.morph
repo: upstream:qt5/qtsensors
- ref: fd3e65ef5ab6eb8e4b5bdad380d1f6862799856c
- unpetrify-ref: v5.3.2
+ ref: 10702cfa8ce803e0911306284c246a879d865f1d
+ unpetrify-ref: v5.4.0
build-depends:
- qtbase
- name: qtserialport
morph: strata/qt5-tools/qtserialport.morph
repo: upstream:qt5/qtserialport
- ref: 286d64c202f461cb8ff5a4cc4c2320af8195b8f0
- unpetrify-ref: v5.3.2
+ ref: 9aef6c3c8ff97b7998bdd813f7c7f3d845b2a53f
+ unpetrify-ref: v5.4.0
build-depends:
- qtbase
- name: qtx11extras
morph: strata/qt5-tools/qtx11extras.morph
repo: upstream:qt5/qtx11extras
- ref: 2d84caf5ef1b5dace0d678df4581db3c955be6ee
- unpetrify-ref: v5.3.2
+ ref: a21bbb45019e1bbc7b583811ff2e84757082a01a
+ unpetrify-ref: v5.4.0
build-depends:
- qtbase
- name: qtxmlpatterns
morph: strata/qt5-tools/qtxmlpatterns.morph
repo: upstream:qt5/qtxmlpatterns
- ref: 78c2367e22d87b529610117f5b6abef6934abdcf
- unpetrify-ref: v5.3.2
+ ref: 2e8b90b33d1d8dce4acdb6a116a227f2a5d3e044
+ unpetrify-ref: v5.4.0
build-depends:
- qtbase
- name: qtdoc
morph: strata/qt5-tools/qtdoc.morph
repo: upstream:qt5/qtdoc
- ref: 688019893d2cbd9ccdc4d75c550bca4530a46ee4
- unpetrify-ref: v5.3.2
+ ref: 251f5eaa2dae740c0d0217893038a3f5bab2bca3
+ unpetrify-ref: v5.4.0
build-depends:
- qtbase
- name: qtgraphicaleffects
morph: strata/qt5-tools/qtgraphicaleffects.morph
repo: upstream:qt5/qtgraphicaleffects
- ref: 82abf6975b6737259ee656564e5ec7f8ad1d0508
- unpetrify-ref: v5.3.2
+ ref: 9e9600d92224084f7942a6bd83b926c630a29747
+ unpetrify-ref: v5.4.0
build-depends:
- qtbase
- qtdeclarative
- name: qtimageformats
morph: strata/qt5-tools/qtimageformats.morph
repo: upstream:qt5/qtimageformats
- ref: 85e621e3ecf449bb0587bd4da97ca66179b24f31
- unpetrify-ref: v5.3.2
+ ref: fdc7026fb7d098abbf135fd5e7d2cf00884f9235
+ unpetrify-ref: v5.4.0
build-depends:
- qtbase
- name: qtconnectivity
morph: strata/qt5-tools/qtconnectivity.morph
repo: upstream:qt5/qtconnectivity
- ref: 8a33a9b43dcc5e7f9a77237a660a3759286e6b86
- unpetrify-ref: v5.3.2
- build-depends:
+ ref: 5d405d07fb51502d0bfab08f4d74aa5eba365bab
+ unpetrify-ref: v5.4.0
+ build-depends:
- qtbase
- name: qtlocation
morph: strata/qt5-tools/qtlocation.morph
repo: upstream:qt5/qtlocation
- ref: a36d9e67e3b8168cb4d1eb76eda96ebb8242fd20
- unpetrify-ref: v5.3.2
- build-depends:
+ ref: 7791dd790d2b15751b703db70a5fceb31d3fd99f
+ unpetrify-ref: v5.4.0
+ build-depends:
- qtbase
- name: qtwebsockets
morph: strata/qt5-tools/qtwebsockets.morph
repo: upstream:qt5/qtwebsockets
- ref: 00f77bdc5beb62e980216cfee906ab7aa1d1c4f7
- unpetrify-ref: v5.3.2
- build-depends:
+ ref: d1c9ede19976767393fe5db2f396c0c18d6fbced
+ unpetrify-ref: v5.4.0
+ build-depends:
- qtbase
-