diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-14 03:00:46 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-14 03:00:46 +0200 |
| commit | 3064d50f0e58599dbb9818a1c558b4ad77e47350 (patch) | |
| tree | 124d153da2efc5a6b71ac3c4bf6514992f1fa565 /src/multimedia/controls/qvideoencodersettingscontrol.h | |
| parent | c255094bf5ee6f4b84c075ccbe84d01dd68020ad (diff) | |
| parent | 0ec11e3393095dc242030825a6a18dc89e196f99 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ia47405600e536bb8e00f47d452aadcaadee93aea
Diffstat (limited to 'src/multimedia/controls/qvideoencodersettingscontrol.h')
0 files changed, 0 insertions, 0 deletions