diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-10-03 14:55:17 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-10-03 14:55:17 +0300 |
| commit | a98904bd3077e46872ba1eeeb7b3554681df49b6 (patch) | |
| tree | 942899cf38c5fee1b50f045aedf4b18f7d29a2d1 | |
| parent | 14e2a458c1a380c55de92286a66f27ec835c80f3 (diff) | |
| parent | 950fda28d55287a5983ebe455fef6844e9f6cdc2 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-6.2.7' into tqtc/lts-6.2-opensource
Change-Id: Id5c3041d6298dcf34654a6afd006fef958e5bade
| -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 3103a13d..24e796fe 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.2.6 +MODULE_VERSION = 6.2.7 diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 16d158c6..64cbbaae 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -1,4 +1,5 @@ version: 2 +alias: qtserialport accept_configuration: condition: property property: features |