summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2021-06-21 14:33:02 +0200
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2021-06-21 14:42:06 +0200
commitcbfd3e4b508d12243c85db34b496023edbb00f8a (patch)
treec61e8ee28ab6e51e100e9837e25cfbd2ce42f038
parent49f8de39c1604c51e42fd6522377a608f52cb5c0 (diff)
Update dependencies manually
Since qtmultimedia does still have "ignore" status in qt5.git, this is not done automatically yet. Get on top of recent qtbase/qtdeclarative before un-ignoring the module. Change-Id: Ibccb26f9ec6035ef4d1d3c208240860b2aefeaf8 Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
-rw-r--r--dependencies.yaml8
1 files changed, 4 insertions, 4 deletions
diff --git a/dependencies.yaml b/dependencies.yaml
index c1f23821f..9876b3543 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -1,13 +1,13 @@
dependencies:
../qtbase:
- ref: e473d96e65e7cf3190c6c16acace6359964d0bee
+ ref: 2b2b3155d9f6ba1e4f859741468fbc47db09292b
required: true
../qtshadertools:
- ref: a17f5b3e3a02500f758aabf80afe4d9904cbbf14
+ ref: 7da9d5145f963137a53109f5ce7ba0ee79e47458
required: false
../qtdeclarative:
- ref: 22169421d462e01dbda9aff54e71dd1ed62ee90f
+ ref: 5a325943536721f4117576390c29807d930be3a1
required: false
../qtquickcontrols2:
- ref: 1a65241804842e9456834d29b74f96e1d7b24cc1
+ ref: d82382fe2befd9d80f0b030d3aac985195104c23
required: false