diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:34:06 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:34:06 +0100 |
| commit | 479200211cdf5bb197ac3190fbab4eea09eee721 (patch) | |
| tree | 7987dfa3da126810ac723d2c163676ab318ea7b1 /src/multimedia/controls/qmediaavailabilitycontrol.cpp | |
| parent | c0f32f8337d966d49a831bc746305c69e3debb7b (diff) | |
| parent | daac69f2f9e9ff9be06484dbdc10d139e83ab502 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
Change-Id: Id86ba6a51a1543ba56504af8bb262c8666db9f50
Diffstat (limited to 'src/multimedia/controls/qmediaavailabilitycontrol.cpp')
0 files changed, 0 insertions, 0 deletions