diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-22 21:57:04 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-02-22 05:34:48 +0000 |
| commit | 504c76c914bd06de010af480602f6d27551bcda6 (patch) | |
| tree | 101f8dbd379a8918b641502133d53c9c1be07291 /dependencies.yaml | |
| parent | 9147dedeaec429b01049eeca152b95a64466a717 (diff) | |
| parent | ef051d6a341bd8e426715421622ed8d63d2afb40 (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: I7436e415d509594cb8a50a60cc0228c6d32e048e
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 3102e381b..46ce3dd9c 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: false |