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:29 +0100
commit31d1f6f64d19991b80211e11c46fed5c0697d3b5 (patch)
treeceaa1b74e2711d1f62b17ab750eca97f236057d2 /src/imports/multimedia/qdeclarativecamera.cpp
parent518dba2fd97be21ec49223c881a35823439cb32e (diff)
parent9514bba6c6bb41e304b450544c6e6b69080572a5 (diff)
Merge "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