diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-08-29 09:39:06 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-08-29 09:39:06 +0300 |
| commit | 3004cb63cdac310c42df72bade324b6d523ea77f (patch) | |
| tree | cf69d6d699ddffa652be7a7fdc83514f1d0764ff | |
| parent | a1ca4a1231fc0e23cbae45bfb0c22e7615d4e21e (diff) | |
| parent | f78ebbcba3fe8c3641f94242389b87f1b9256e8f (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: I286a49e41aac6a43c2bf8eed73c10f223ec8857c
| -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 db2f4d9..1c4d0dd 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH -MODULE_VERSION = 6.2.12 +MODULE_VERSION = 6.2.13 diff --git a/dependencies.yaml b/dependencies.yaml index 95566ec..a674dda 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../tqtc-qtdeclarative: - ref: a7c766a9863605eb81e8f0cdb4d2b93e087b5bde + ref: c6fdadd916a7568c1d71b750e054ca9aa2fd5dfc required: true ../tqtc-qtwebengine: - ref: e23906fc7444a1d9d57bc1c3c2b09ebf1c3d3c64 + ref: 46bc69dcbf02bd4b0eece3a7ac20ef0aa7af3958 required: false |