summaryrefslogtreecommitdiffstats
path: root/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-07-16 03:04:15 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-07-16 03:04:21 +0200
commit5825dd2773755cea236d9816cc7541bc20f9cb80 (patch)
treebe43ebef8bcabf67857758ffe21997787c5a7bc4 /src/qtmultimediaquicktools/qdeclarativevideooutput.cpp
parentd035d4de3770427396bd4e6a7db9b6c7161e2abf (diff)
parent95d79238beb2dd5832aaa044640d7a1bb0c790b3 (diff)
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'src/qtmultimediaquicktools/qdeclarativevideooutput.cpp')
0 files changed, 0 insertions, 0 deletions