summaryrefslogtreecommitdiffstats
path: root/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-11-20 13:46:06 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-11-20 13:46:06 +0100
commit5c0cca78f410e8a89d3216aeba916d73070398f4 (patch)
treee21b54b36dde0825f9c07899c705dcbb91dcabbd /src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp
parent4e809d4be9bb60cb20e5c98e4b2664af8e1cc2f3 (diff)
parent49bf444b44dac10602af0af862f0951835ea5895 (diff)
Merge remote-tracking branch 'origin/5.14' into 5.15
Diffstat (limited to 'src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp')
0 files changed, 0 insertions, 0 deletions