diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-22 22:41:39 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-02-20 06:40:50 +0000 |
| commit | c5e59f6ab90be0f9e31488c676b2e0ebef7a99a0 (patch) | |
| tree | de15d287522268a7c833f21e7f7b68a48678f508 /dependencies.yaml | |
| parent | 607e0da419b604b971ce01f51bc94920c61191f7 (diff) | |
| parent | 02f37ef2aebf8ec7ff01e6c6a659394b62c363c2 (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: I1da0a31181dfa567321fabf76ec103bb4b8dd3dd
Diffstat (limited to 'dependencies.yaml')
| -rw-r--r-- | dependencies.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dependencies.yaml b/dependencies.yaml index fee29a4..f522f48 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,4 +1,4 @@ dependencies: ../tqtc-qtbase: - ref: 694575a59b5370afc494fbf700eee8db1d1ec091 + ref: 67934c103800bae50c2ec1977758d40fa8e4e507 required: true |