diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-23 15:56:31 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-02-22 05:47:02 +0000 |
| commit | a3d68a7898787e027d24872cfb47983a21192a35 (patch) | |
| tree | 6a21269d4947a895a212fa30d62bd68bc1f10531 | |
| parent | 71b1bd86baca298373b22114bf14dc38c039b2e4 (diff) | |
| parent | 4d6b2a4218f0b6e7d9ab189d2aa6898f0ed542c8 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-6.2.8' into tqtc/lts-6.2-opensource
Conflicts solved in a file:
dependencies.yaml
Change-Id: I97b7eef82828e6d54bd505697e439569e1081048
| -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 f6f7fed..55ff681 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1 +1 @@ -set(QT_REPO_MODULE_VERSION "6.2.7") +set(QT_REPO_MODULE_VERSION "6.2.8") diff --git a/dependencies.yaml b/dependencies.yaml index f271324..5ee3332 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../../qt/tqtc-qtdeclarative: - ref: 02277e3753613d9e19bbb36367c7d2b1d13d7545 + ref: 302ab20d46280e11042f3896460c55d8b8146e41 required: true ../tqtc-qttools: - ref: 0f75d2b2e6c4a049682c2cc520cfc9184ef52454 + ref: 925864c123ba736618af49f4ee0d2ebb25aa403b required: false |