diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-18 20:57:54 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-18 20:57:54 +0100 |
| commit | 0354fdda8b430f7749082ca55ad6c1dc781f3918 (patch) | |
| tree | d480a0b1ba868ea16d5649ca540b97b0e8369077 /src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp | |
| parent | 51914a22de1232913f8e4be4468d676b300aed7c (diff) | |
| parent | c98c346d12b1a6ba99d18059db5b941d6138b081 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta1
Conflicts:
.qmake.conf
Change-Id: I2af17ff905c26466fa1ea8b612dff3b505a3d33a
Diffstat (limited to 'src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp')
0 files changed, 0 insertions, 0 deletions