diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-08-26 15:40:53 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-08-26 15:40:53 +0300 |
| commit | c1e3a57334ff359aa414d43098cff8dece14fe32 (patch) | |
| tree | d6c363325e1aa5654d21e105787b4c8df80975ef | |
| parent | daffef306ce52feb4634ca3a8a5fce91e9507b61 (diff) | |
| parent | f721faf20614f6e5a2af27ae4243780392106bd1 (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: I610b4d7734f1f44fa51fa0c20dde56b40a58b28c
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | dependencies.yaml | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/.cmake.conf b/.cmake.conf index 7733def..0fcb9b1 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 1de3120..2b95ebd 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ CONFIG += warning_clean DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS -MODULE_VERSION = 6.2.12 +MODULE_VERSION = 6.2.13 diff --git a/dependencies.yaml b/dependencies.yaml index c67cb25..ce2c6d0 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../tqtc-qtbase: - ref: 3a82051eade32b34c2f4f6f652a9d8ef0db96c71 + ref: a963a536e623499cc56b0231c35dc5790a4bbc29 required: true ../tqtc-qtdeclarative: - ref: a7c766a9863605eb81e8f0cdb4d2b93e087b5bde + ref: c6fdadd916a7568c1d71b750e054ca9aa2fd5dfc required: true |