summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTarja Sundqvist <tarja.sundqvist@qt.io>2023-10-03 14:55:09 +0300
committerTarja Sundqvist <tarja.sundqvist@qt.io>2023-10-03 14:55:09 +0300
commit01862c308d35cf5ab241d9683edfb18891cec92a (patch)
treeca8021f8a69e5fbbd17eb1d865ab006dec3db90d
parent010ef8d9f5cecba190c73ac2bdce54864ae58357 (diff)
parentd4c3c6f108e52c87f50d5388494f6ce202af56f8 (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 1bd06ca..c3bb299 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -3,4 +3,4 @@ load(qt_build_config)
ROOT_SOURCE_DIR=$$PWD
ROOT_BUILD_DIR=$$shadowed($$PWD)
-MODULE_VERSION = 6.2.6
+MODULE_VERSION = 6.2.7
diff --git a/coin/module_config.yaml b/coin/module_config.yaml
index 4006b48..2c61761 100644
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -1,4 +1,5 @@
version: 2
+alias: qtopcua
accept_configuration:
condition: property
property: features