diff options
author | Liang Qi <liang.qi@qt.io> | 2018-02-14 10:27:31 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-02-14 10:27:31 +0100 |
commit | 51914a22de1232913f8e4be4468d676b300aed7c (patch) | |
tree | 23e3eeaf997c8d572b6bb94b447f7d612e0e03b0 /src/plugins/winrt/qwinrtcameralockscontrol.h | |
parent | 9439e1ee9ca02270a1609636cd8cdd42c63a4f25 (diff) | |
parent | 038716bb1f2d9b95f2d638e2d61d297563343af9 (diff) | |
download | qtmultimedia-51914a22de1232913f8e4be4468d676b300aed7c.tar.gz |
Merge remote-tracking branch 'origin/5.10.1' into 5.11v5.11.0-alpha1
Change-Id: If65f60670bbfb011363a1b5230253805b3e63553
Diffstat (limited to 'src/plugins/winrt/qwinrtcameralockscontrol.h')
0 files changed, 0 insertions, 0 deletions