diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-08-27 16:46:30 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-08-27 16:46:30 +0300 |
| commit | f629cc2be734eaa9ddcfbfffa4eb39dfb8ccc61d (patch) | |
| tree | 85b5bdddb685104c0cbfc26384ebaedc5a4812cd | |
| parent | 0f564c37a352f52f17e0c91c363da536ff0fd10d (diff) | |
| parent | c2bfd4be6156cc5b14251c04500cc0f95295d571 (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: Id21e3998252bf0ba4317f38247ae48c4efcbb40d
| -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 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 b7ad2645..f32b408f 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) 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 b5879698..55f9d1bc 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-qtmultimedia: - ref: 4d5cab73c0ca3c5f4cb486ca5297724ceba52e6f + ref: 1180358ed7d621c1ff696dda397f130c2183e94e required: false |