diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-08-26 15:51:41 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-08-26 15:51:41 +0300 |
| commit | c07e67afc4cf44a426fca18a20b404459ed419ed (patch) | |
| tree | a090b222f9925c766c4ffcf7674e5bcc9d09038d | |
| parent | f836767d1d82020c85e0058b785e2ffb079141ef (diff) | |
| parent | 151e4ae9f19c90464a9ddc8656e39cc378da81a8 (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: Id4d002272804c9618a11f105d3c6ef9d69566786
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | dependencies.yaml | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/.cmake.conf b/.cmake.conf index 7733def21..0fcb9b1a0 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 62acae053..099755d76 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -6,4 +6,4 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH DEFINES += QT_NO_JAVA_STYLE_ITERATORS -MODULE_VERSION = 6.2.12 +MODULE_VERSION = 6.2.13 diff --git a/dependencies.yaml b/dependencies.yaml index fdccde2fa..93c35f964 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: 3a82051eade32b34c2f4f6f652a9d8ef0db96c71 + ref: a963a536e623499cc56b0231c35dc5790a4bbc29 required: true ../tqtc-qtdeclarative: - ref: a7c766a9863605eb81e8f0cdb4d2b93e087b5bde + ref: c6fdadd916a7568c1d71b750e054ca9aa2fd5dfc required: false ../tqtc-qtshadertools: - ref: ebe45c38bffcf8c3487949045f9ecf9c8a5f7e30 + ref: 4e8c28a3dc8d4dd6e237f7cc4235c078147385a2 required: false |