diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-08-26 15:36:52 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-08-26 15:36:52 +0300 |
| commit | 97d68473724cb499fd867e67785721366fcb3482 (patch) | |
| tree | 362c09bfacb646dff878fa00b658ef3ae49a43c9 | |
| parent | cfdbcda1729c01ab52a70c2706251f61d15297b3 (diff) | |
| parent | c4d1270b0321060e300e692de81d29a5a7b758e5 (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: Ia3cdb4a552bf176f7607d7fdce9c637610f21ce3
| -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 56b53a0..e7c7b38 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,6 +2,6 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 6.2.12 +MODULE_VERSION = 6.2.13 CMAKE_MODULE_TESTS = - 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 |