diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-22 23:11:09 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-02-22 05:33:09 +0000 |
| commit | 6a26629a367a35293e9ef03923538a917450c157 (patch) | |
| tree | 6df5d6b23659f01e70843893d7efdf1d58a3e4e3 /dependencies.yaml | |
| parent | a99c381a9f179122335d6ff6413438e1724588c4 (diff) | |
| parent | 8e2150448493962998413257514a605b24792696 (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: I80371174434e13c2d399c8ad242a604b18ce954b
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 3e7d691..ce9187b 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-qtwebsockets: - ref: f14626e48c704f82fcb510ad6e6e26722c2dad15 + ref: 405bc8e140f934c1226b91544daf170d0341d282 required: false |