diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-08-27 15:53:08 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-08-27 15:53:08 +0300 |
| commit | 5acdb54f5674ac3658d217d8a518d124d5892630 (patch) | |
| tree | 9c6ca57d782f2f0d3ce2e42522f28155f113e1d0 | |
| parent | ca9dc62849b91f9e8107ace4fc1e0e12b7a2dba6 (diff) | |
| parent | db4f3c6b5c6e1446b29aeb618e0611ae44c73c89 (diff) | |
Merge branch 'tqtc/lts-6.2.13' into tqtc/lts-6.2-opensource6.2
Conflicts solved:
dependencies.yaml
Change-Id: I924ae8c947a21371d73e6e0f4753140e9a96a0bf
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | dependencies.yaml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.cmake.conf b/.cmake.conf index 897ec4a..b781002 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1 +1 @@ -set(QT_REPO_MODULE_VERSION "6.2.12") +set(QT_REPO_MODULE_VERSION "6.2.13") diff --git a/dependencies.yaml b/dependencies.yaml index 038c7a0..d7f04c6 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../../qt/tqtc-qtdeclarative: - ref: a7c766a9863605eb81e8f0cdb4d2b93e087b5bde + ref: c6fdadd916a7568c1d71b750e054ca9aa2fd5dfc required: true ../tqtc-qttools: - ref: a78a36d69a792ae66fc062e461b83c28152a6856 + ref: d000041a232a428ba08e31323840d484642f5886 required: false |