diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-20 23:37:55 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-20 23:37:55 +0200 |
| commit | da3c93e18491c3b64f26af8df55a2c715b8b44b3 (patch) | |
| tree | b549ca549c2d740b0d9207177ac1a398229c2451 /src/plugins/avfoundation/camera/avfcamerawindowcontrol.h | |
| parent | 457181d73c5bc188cfea13e13dbe930de3b993d3 (diff) | |
| parent | d8d072417b08dd75734b3f0aa86c3a49db934770 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I160b25219c806d9d3a30644fa1a5e589c5aca039
Diffstat (limited to 'src/plugins/avfoundation/camera/avfcamerawindowcontrol.h')
0 files changed, 0 insertions, 0 deletions