diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-08-27 16:05:54 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-08-27 16:05:54 +0300 |
| commit | 3f572ba3113c4068d7c92e0d002bc0693affa1aa (patch) | |
| tree | 14552f0061d99075bb41f1aa0038c11a573428f2 | |
| parent | 4836e9a0319a938bae421f2edb18717d603218ba (diff) | |
| parent | 4ef9be8c8ae4ab1345d95e742c6fd2edf3fe6f34 (diff) | |
Merge tag 'v6.2.13-lts' into tqtc/lts-6.2-opensourcev6.2.13-lts-lgpl6.2
Qt 6.2.13-lts release
Conflicts solved:
dependencies.yaml
Change-Id: I9b38da7cd8137bf2a3df2e5e894893c2889461e0
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | dependencies.yaml | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/.cmake.conf b/.cmake.conf index 7733def2..0fcb9b1a 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,2 +1,2 @@ -set(QT_REPO_MODULE_VERSION "6.2.12") +set(QT_REPO_MODULE_VERSION "6.2.13") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "") diff --git a/.qmake.conf b/.qmake.conf index e5aeba22..bfa67381 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 6.2.12 +MODULE_VERSION = 6.2.13 diff --git a/dependencies.yaml b/dependencies.yaml index 1f269a56..eba1b9fa 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,13 +1,13 @@ dependencies: ../tqtc-qtbase: - ref: 3a82051eade32b34c2f4f6f652a9d8ef0db96c71 + ref: a963a536e623499cc56b0231c35dc5790a4bbc29 required: true ../tqtc-qtdeclarative: - ref: a7c766a9863605eb81e8f0cdb4d2b93e087b5bde + ref: c6fdadd916a7568c1d71b750e054ca9aa2fd5dfc required: true ../tqtc-qtquicktimeline: - ref: cfdbcda1729c01ab52a70c2706251f61d15297b3 + ref: 97d68473724cb499fd867e67785721366fcb3482 required: false ../tqtc-qtshadertools: - ref: ebe45c38bffcf8c3487949045f9ecf9c8a5f7e30 + ref: 4e8c28a3dc8d4dd6e237f7cc4235c078147385a2 required: true |