diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2022-09-07 10:51:15 -0700 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2025-03-13 19:53:21 +0000 |
| commit | 457a8631546b430195bdb164af5cb8e09858cf7d (patch) | |
| tree | c027b692b24d115082d0cb7d4e82f66334470259 /src/opengl/qopenglvertexarrayobject.cpp | |
| parent | 2f169f9e0cbbb17c98d7e59213a0c35401b33ea4 (diff) | |
3rdparty: update TinyCBOR to v0.6.1
[ChangeLog][Third-Party Code] The copy of TinyCBOR in Qt was updated to
0.6.1.
Manual conflict resolution for 6.9:
- worked around 34f60877bdb54786c62fd1bf5b44a81430aa411f not having
been picked to older branches
Change-Id: If5d5ef6220874ae8858efffd1712a567597b6317
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit 7df128675a22391bc3ade2a45b558bc38eee1c67)
(cherry picked from commit cd395a79993e6d088f0d539d7f2516671524ee53)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/opengl/qopenglvertexarrayobject.cpp')
0 files changed, 0 insertions, 0 deletions
