diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-18 15:27:54 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-11-18 15:27:54 +0000 |
| commit | bcdfb1e6b9c81d7b63554531fc63084625d4f191 (patch) | |
| tree | aa04d1b5a84a30c374be6f02a4c6ca138a333475 /src/plugins/avfoundation/camera/avfcameraservice.mm | |
| parent | 88c3398e0e7cb8efa5dd0044ee65a7cee74d4fd0 (diff) | |
| parent | 04e36a02f2134e0619b44aac2243cb22e106d63c (diff) | |
Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6
Diffstat (limited to 'src/plugins/avfoundation/camera/avfcameraservice.mm')
0 files changed, 0 insertions, 0 deletions