diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-22 22:38:27 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-02-20 10:05:13 +0000 |
| commit | 302ab20d46280e11042f3896460c55d8b8146e41 (patch) | |
| tree | 3cef87d6ca24d2e37a3dc8c4af4506e510903a78 /dependencies.yaml | |
| parent | 02277e3753613d9e19bbb36367c7d2b1d13d7545 (diff) | |
| parent | a7df6331b29e44ed364fcd7297c4e1bc6ce2167c (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: Ib4083daa41a689b937d2aeb522e93e3aab0be1c4
Diffstat (limited to 'dependencies.yaml')
| -rw-r--r-- | dependencies.yaml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dependencies.yaml b/dependencies.yaml index 481d9f48ba..d3f1ef8260 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,13 +1,13 @@ dependencies: ../tqtc-qtbase: - ref: 694575a59b5370afc494fbf700eee8db1d1ec091 + ref: 67934c103800bae50c2ec1977758d40fa8e4e507 required: true ../tqtc-qtimageformats: - ref: 607e0da419b604b971ce01f51bc94920c61191f7 + ref: c5e59f6ab90be0f9e31488c676b2e0ebef7a99a0 required: false ../tqtc-qtshadertools: - ref: 5de9eb91f047e8001ac24f0bdf5ffc72adb37236 + ref: f9868e2b39e539b1bb6917006b789ab7b5fec5eb required: false ../tqtc-qtsvg: - ref: 42fb62219b3d41481f4065d222f227614f41fbe8 + ref: 40235be466095382836e9b544dc921077c47b417 required: false |