summaryrefslogtreecommitdiffstats
path: root/src/imports/multimedia/qdeclarativecamera.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-03-10 03:05:22 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-03-10 03:05:22 +0100
commit9514bba6c6bb41e304b450544c6e6b69080572a5 (patch)
treec263293631f8a4616e13bf19034e0fa1c314af24 /src/imports/multimedia/qdeclarativecamera.cpp
parent19477de84a64f412bca9ce2df62ab9adb3859da2 (diff)
parent7f0a20ad066020d913faff636b8a0c5f61d2dfe0 (diff)
Merge remote-tracking branch 'origin/5.14' into 5.15
Diffstat (limited to 'src/imports/multimedia/qdeclarativecamera.cpp')
0 files changed, 0 insertions, 0 deletions