diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-10-03 14:55:13 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-10-03 14:55:13 +0300 |
| commit | 44b2baeb221b4b6c0da51bafac30dd9c6d0e5bff (patch) | |
| tree | 9bb9bbbf0dfcf14b13a488e793ba644a577a0a75 | |
| parent | 3abeee576bed28568577f6ea51d36da7b23108d8 (diff) | |
| parent | bbbe83f9d1c05cf63e898891b8f54b49d800e596 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-6.2.7' into tqtc/lts-6.2-opensource
Change-Id: I686e54559351bdaab2bbc3a3ac0706cc185bb459
| -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 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 69a3da1..f687f63 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,6 +2,6 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 6.2.6 +MODULE_VERSION = 6.2.7 CMAKE_MODULE_TESTS = - diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 16d158c..a39801f 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -1,4 +1,5 @@ version: 2 +alias: qtquicktimeline accept_configuration: condition: property property: features |