diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-11 09:13:58 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-11 09:13:58 +0100 |
| commit | e2275ade82540561ca026325ff945fdfa90f13fe (patch) | |
| tree | c78e3e8cf574d0750eac7788f0182c1fadef69b7 /examples/multimediawidgets/customvideosurface/customvideowidget | |
| parent | 89e4c8286d4f06239442ca0d8a9f89761cfc64da (diff) | |
| parent | 80898b03be54e2855472987f60f4c2526344389b (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
src/multimedia/camera/qcamera.cpp
Change-Id: If06a4c6a7dde35d5b95abcc5213ff281dca9374e
Diffstat (limited to 'examples/multimediawidgets/customvideosurface/customvideowidget')
0 files changed, 0 insertions, 0 deletions