summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Buhr <andreas@andreasbuhr.de>2021-02-12 15:30:55 +0100
committerAndreas Buhr <andreas@andreasbuhr.de>2021-02-16 14:46:53 +0100
commit5432db3ef29461bd93986331758aae5301348ac6 (patch)
treefd691c569f30dc6e7ca290fd6c165cfb829ed7b7
parent4c0c80f60b2853ec073bb20883ce11da64a074b0 (diff)
downloadqtconnectivity-5432db3ef29461bd93986331758aae5301348ac6.tar.gz
Update QtConnectivity version number to 6.1.0 and update dependencies
QtConnectivity is still at version 6.0.0. This patch updates to 6.1.0 and does the required update of dependencies. Change-Id: I6ae9d32d09d33df3dac115782b4d98ea28b85e81 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
-rw-r--r--.cmake.conf2
-rw-r--r--.qmake.conf2
-rw-r--r--dependencies.yaml4
3 files changed, 4 insertions, 4 deletions
diff --git a/.cmake.conf b/.cmake.conf
index 93054804..213991f5 100644
--- a/.cmake.conf
+++ b/.cmake.conf
@@ -1 +1 @@
-set(QT_REPO_MODULE_VERSION "6.0.0")
+set(QT_REPO_MODULE_VERSION "6.1.0")
diff --git a/.qmake.conf b/.qmake.conf
index 3066cd88..fd031b51 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -2,4 +2,4 @@ load(qt_build_config)
DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS
-MODULE_VERSION = 6.0.0
+MODULE_VERSION = 6.1.0
diff --git a/dependencies.yaml b/dependencies.yaml
index 7f706ef7..d420d56e 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -1,7 +1,7 @@
dependencies:
../qtandroidextras:
- ref: c3c4ac40441aae499ba7d4082b3e643dfd0a0f21
+ ref: 5d2d396dc470bb772fb755d2afcfbd89aa58c4eb
required: false
../qtdeclarative:
- ref: 31211f1415f221ed1a974663fdde117fd6de357d
+ ref: b9f7d428773b90c06b436eedde8cface4b9e2522
required: false