diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-01-30 22:04:05 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-01-30 22:04:05 +0200 |
| commit | 09bd8ccbbad594c77daa6b498e8ebed47f55b1cc (patch) | |
| tree | b5cb3a9d479940b3e8b4e588448ea4054dac89cf | |
| parent | ad9070db729c956725eccd21732b7889aba6a04d (diff) | |
| parent | 583ade083df85782d7c5a1cb8ae8e857050548a1 (diff) | |
Merge tag 'v6.2.12-lts' into tqtc/lts-6.2-opensourcev6.2.12-lts-lgpl6.2
Qt 6.2.12-lts release
Conflicts solved:
dependencies.yaml
Change-Id: Ida66a17f1284eda60f53efa27cf27b0aa0bd1d6a
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | dependencies.yaml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.cmake.conf b/.cmake.conf index 842b347..7733def 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,2 +1,2 @@ -set(QT_REPO_MODULE_VERSION "6.2.11") +set(QT_REPO_MODULE_VERSION "6.2.12") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "") diff --git a/.qmake.conf b/.qmake.conf index 52537a2..4716f2e 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -4,4 +4,4 @@ CONFIG += warning_clean DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS -MODULE_VERSION = 6.2.11 +MODULE_VERSION = 6.2.12 diff --git a/dependencies.yaml b/dependencies.yaml index 5611a53..c67cb25 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -3,5 +3,5 @@ dependencies: ref: 3a82051eade32b34c2f4f6f652a9d8ef0db96c71 required: true ../tqtc-qtdeclarative: - ref: d8a396b76168b66b8cd938f61d8d958ebdb14871 + ref: a7c766a9863605eb81e8f0cdb4d2b93e087b5bde required: true |