diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-01-28 17:42:56 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-01-28 17:42:56 +0200 |
| commit | 8dd102eea4bf0e6d683f9f8bdfe74c5d63a626c8 (patch) | |
| tree | ac4fee19603f36271f9a3e50ceac762daf9fbaad | |
| parent | 0f65570d4c302c564a356cd4a0e6ffc263df46d1 (diff) | |
| parent | c979e3aa3393e0b8c8243790c66304266e3ccc7f (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: I144982678de4a74bc49c08aa1bad6e3e45bd6e6c
| -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 6cf0392..ced6d32 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,5 +2,5 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS -MODULE_VERSION = 6.2.11 +MODULE_VERSION = 6.2.12 |