summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTarja Sundqvist <tarja.sundqvist@qt.io>2023-10-03 14:55:05 +0300
committerTarja Sundqvist <tarja.sundqvist@qt.io>2023-10-03 14:55:05 +0300
commitc700883b08d2f2e66921a0fa2951fc98437b29b0 (patch)
tree16df4df923ef60b595aa746c417529d55d04d09f
parentc4542917ec6f38a5dde98a2718853b4109036109 (diff)
parenta7b793dcda7357b3fac6ef63428ea13c7e61a79b (diff)
Merge remote-tracking branch 'origin/tqtc/lts-6.2.7' into tqtc/lts-6.2-opensource
-rw-r--r--.cmake.conf2
-rw-r--r--.qmake.conf2
-rw-r--r--coin/module_config.yaml1
3 files changed, 3 insertions, 2 deletions
diff --git a/.cmake.conf b/.cmake.conf
index 6f32ba4..07d90b8 100644
--- a/.cmake.conf
+++ b/.cmake.conf
@@ -1,2 +1,2 @@
-set(QT_REPO_MODULE_VERSION "6.2.6")
+set(QT_REPO_MODULE_VERSION "6.2.7")
set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "")
diff --git a/.qmake.conf b/.qmake.conf
index 7d19ea3..0f7f82c 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -3,4 +3,4 @@ CONFIG += warning_clean
DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS
-MODULE_VERSION = 6.2.6
+MODULE_VERSION = 6.2.7
diff --git a/coin/module_config.yaml b/coin/module_config.yaml
index 16d158c..c58e67a 100644
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -1,4 +1,5 @@
version: 2
+alias: qtlottie
accept_configuration:
condition: property
property: features