diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-01-30 21:53:53 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-01-30 21:53:53 +0200 |
| commit | ea59098c0ab24f463807d5695131c9a0b1760aad (patch) | |
| tree | c804b39468920559b1f20215cd571b1e2eb81296 | |
| parent | 4676aefe7e91942b9a9cc703087b5c4cb6d5e907 (diff) | |
| parent | 434b0697b4883d31200e4dfbfec7a73eed4bbbf6 (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: I82e2a37d0880834575af5401cde8601df7d80edf
| -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 842b347c..7733def2 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 68890b08..8e3d64e8 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ CONFIG += warning_clean DEFINES += QT_NO_JAVA_STYLE_ITERATORS -MODULE_VERSION = 6.2.11 +MODULE_VERSION = 6.2.12 diff --git a/dependencies.yaml b/dependencies.yaml index c3c65d7a..65893d89 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -3,7 +3,7 @@ dependencies: ref: 3a82051eade32b34c2f4f6f652a9d8ef0db96c71 required: true ../tqtc-qtdeclarative: - ref: d8a396b76168b66b8cd938f61d8d958ebdb14871 + ref: a7c766a9863605eb81e8f0cdb4d2b93e087b5bde required: false ../tqtc-qtserialport: ref: b19eb455a1f051084caaf8d0a9ecf09176f8fd4a |