diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-12 03:03:46 +0100 |
|---|---|---|
| committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-11-12 08:27:43 +0000 |
| commit | d64287dc19f621f0041e115fa28182339f286216 (patch) | |
| tree | b6d0b6304adce00a7d7dd35c8912571a4153f760 /sync.profile | |
| parent | 838eb6b8b42acc9e418c7f1fd2b105ce37ebf49b (diff) | |
| parent | cb8f5067a2fdf73f4f5b71ab3c7bcc65dc13c387 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/multimedia/video/qvideosurfaces_p.h
src/multimedia/video/video.pri
tests/auto/unit/qvideoframe/tst_qvideoframe.cpp
Change-Id: I74fe2dbdf4c3e7db78a2d9b43411266bb6b97819
Diffstat (limited to 'sync.profile')
0 files changed, 0 insertions, 0 deletions