diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-22 22:32:50 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-02-22 09:00:18 +0000 |
| commit | 5469973aa049452a2af923f45f6cb3e71959b94c (patch) | |
| tree | 55313017b7b2f9db601257e82086413c902a26d7 /dependencies.yaml | |
| parent | 717118a5d1e33da81651647d6ebb9ceed215227f (diff) | |
| parent | 5e0698c8caff40400ef6bea79e373cfa0c1542ad (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: I500b721c4dd4f139c0dd26dab084505ec485c4a4
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 4049adf4..60640753 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-qtmultimedia: - ref: 7d7a5a372afd1e1c9f6407f8fd90b5ee56723367 + ref: 644e97ff4a0115e9df2579a10367c2649892741f required: false |