diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-21 09:28:06 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-21 09:28:06 +0200 |
| commit | e1ae1235f259393e72e4a2e0d77278e9054405fb (patch) | |
| tree | 04f57d7b2a9429844306c55e9604f10562ba9783 /src/plugins/avfoundation/camera/avfcamerautility.mm | |
| parent | 2e556aef9375377439b9b6da8d455fe891abfd7c (diff) | |
| parent | 01c9322bfe918b886468eb520d77b21b6d8c0c11 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/imports/multimedia/multimedia.cpp
Change-Id: I38899391ec8d2fcec6f2d46514286759f7a27629
Diffstat (limited to 'src/plugins/avfoundation/camera/avfcamerautility.mm')
0 files changed, 0 insertions, 0 deletions