diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-04-10 12:42:28 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-04-10 12:42:28 +0200 |
| commit | 82fdc8913483dd352ae2c326dd358fe9ff8f3f66 (patch) | |
| tree | 5bc321569aa2ba0821a04b0b439edd549ded6512 /src/qtmultimediaquicktools/qdeclarativevideooutput.cpp | |
| parent | f787689e74dee63c55f2731683a4ede752fd9e44 (diff) | |
| parent | c8716f68feb5a38473cbd54972b9a9f095e9e24d (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp
Done-with: Val Doroshchuk <valentyn.doroshchuk@qt.io>
Change-Id: I745dd948c1e98180115f85c17bef802351bbdb6b
Diffstat (limited to 'src/qtmultimediaquicktools/qdeclarativevideooutput.cpp')
0 files changed, 0 insertions, 0 deletions