diff options
author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-10-03 14:55:15 +0300 |
---|---|---|
committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-10-03 14:55:15 +0300 |
commit | bf75135f89309008e9fabaec46d79fa64bb85d15 (patch) | |
tree | 4cfa8f8223ea76aac5a0d32161b32719de846a05 | |
parent | 659995d1dd0c3c85010d1664533560e2a13796f8 (diff) | |
parent | 0023445e5458cd6b2f198add79cd1ac24406e22d (diff) |
Merge remote-tracking branch 'origin/tqtc/lts-6.2.7' into tqtc/lts-6.2-opensource
Change-Id: I7c55208739a0f29233b37261d6f12007b7d86b5f
-rw-r--r-- | .cmake.conf | 2 | ||||
-rw-r--r-- | .qmake.conf | 2 | ||||
-rw-r--r-- | coin/module_config.yaml | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/.cmake.conf b/.cmake.conf index 6f32ba4d..07d90b8a 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 6093d9d1..6a0fd362 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 6.2.6 +MODULE_VERSION = 6.2.7 diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 16d158c6..32d73fc0 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -1,4 +1,5 @@ version: 2 +alias: qtsensors accept_configuration: condition: property property: features |