diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-07 03:03:53 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-07 03:03:53 +0200 |
| commit | d5a1385c7df4714df571d7f80916708b47767a57 (patch) | |
| tree | 93fdd499babe961198e1e6b2f354bddd8f5929b3 /tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.cpp | |
| parent | 7f0503acb042d047682b432e68ed97b1644c3f59 (diff) | |
| parent | c39f90e01e51c9fbc8074993a38e7f9b16338dbb (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta4
Change-Id: Icb722ebe5b9b02791cf3593f2347e398deb837fe
Diffstat (limited to 'tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.cpp')
0 files changed, 0 insertions, 0 deletions