summaryrefslogtreecommitdiffstats
path: root/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-02-23 03:01:03 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-02-23 03:01:03 +0100
commit14b0f477159b5d0d28b38a67c6f329042ad322fa (patch)
treeb28a0a32fbbdb883686c9ee7b12e57ee1a49674c /src/qtmultimediaquicktools/qdeclarativevideooutput.cpp
parent997824d20470cdf33c575c20ce22985fe53cbb00 (diff)
parentfea4d302cddbb91e23864a4dbd786d53b72f67ea (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13
Diffstat (limited to 'src/qtmultimediaquicktools/qdeclarativevideooutput.cpp')
0 files changed, 0 insertions, 0 deletions