diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-06-11 12:19:26 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-06-11 12:19:26 +0300 |
| commit | 5c5a9966e1f8476e59554293fd27d3f21a32d152 (patch) | |
| tree | 4aa5f7981e3eb135930f305452534587202f9e81 | |
| parent | e43fe49199e0cb6691d4decd009ad228db5f81b8 (diff) | |
| parent | f492070f9bd73ec16c0ba06414b98f128421e387 (diff) | |
Merge tag 'v6.2.9-lts' into tqtc/lts-6.2-opensourcev6.2.9-lts-lgpl
Qt 6.2.9-lts release
Conflicts solved:
dependencies.yaml
Change-Id: I4a3a3542b29dea83104420f2d77394c10a3776a8
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | dependencies.yaml | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/.cmake.conf b/.cmake.conf index 55ff681c..0c21440f 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1 +1 @@ -set(QT_REPO_MODULE_VERSION "6.2.8") +set(QT_REPO_MODULE_VERSION "6.2.9") diff --git a/dependencies.yaml b/dependencies.yaml index 7fa8040e..19eadfdf 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,13 +1,13 @@ dependencies: ../tqtc-qtdeclarative: - ref: 9919f58fce6329a233ca885188d0aba5f484e546 + ref: a1b4a68d1165115779ac925f43847a5735671917 required: true ../tqtc-qtmultimedia: - ref: 34dc084899419ab704703a888dbffe119566eaca + ref: 034f7a6dadf48e51d58fecba5c6158c10dc3d4f3 required: true ../tqtc-qtremoteobjects: - ref: 62e9b83d59deb21f57f11eba755a45e0555b0df8 + ref: 17df7329c8b1997977266452baca06a82a28bb55 required: true ../tqtc-qttools: - ref: 2819de71fc973e79aa9b1e44716636ab194108b1 + ref: b84d5a96ee7cfa4a69d4963c771b230613224a15 required: false |