diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-02-05 08:24:37 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-02-05 08:24:37 +0200 |
| commit | d8e026dd688607a77f2674812c308f74e6acba90 (patch) | |
| tree | 51c7f5e90ffe71b6cc1fde74673ac36a5631c551 | |
| parent | 35c7dbe7d48327d489e1fd204b727f58663fb2a3 (diff) | |
| parent | 3519d388fb64dfa2404a0a73afb4f598e42534b7 (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: I2c6e3ffdf17a650735da525b75975c6b20c69664
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | .qmake.conf | 2 |
2 files changed, 2 insertions, 2 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 abd5c71..e4a7e76 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,4 @@ load(qt_build_config) CONFIG += warning_clean -MODULE_VERSION = 6.2.11 +MODULE_VERSION = 6.2.12 |