diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-22 22:43:35 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-02-22 05:30:53 +0000 |
| commit | 644e97ff4a0115e9df2579a10367c2649892741f (patch) | |
| tree | a9c18bc84ebf3f8f0b0098024bcb05b3c44e6bef /dependencies.yaml | |
| parent | 7d7a5a372afd1e1c9f6407f8fd90b5ee56723367 (diff) | |
| parent | 92848e037a6ded98a8bc4485cdad4a239685a342 (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: I567ea83b244225b29a759a63cdc1658d7734035e
Diffstat (limited to 'dependencies.yaml')
| -rw-r--r-- | dependencies.yaml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dependencies.yaml b/dependencies.yaml index 7150fa636..9a6286ac6 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: 694575a59b5370afc494fbf700eee8db1d1ec091 + ref: 67934c103800bae50c2ec1977758d40fa8e4e507 required: true ../tqtc-qtdeclarative: - ref: 02277e3753613d9e19bbb36367c7d2b1d13d7545 + ref: 302ab20d46280e11042f3896460c55d8b8146e41 required: false ../tqtc-qtshadertools: - ref: 5de9eb91f047e8001ac24f0bdf5ffc72adb37236 + ref: f9868e2b39e539b1bb6917006b789ab7b5fec5eb required: true |