diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-20 03:00:33 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-20 03:00:33 +0200 |
| commit | 95818e11936e8c85172b2675132a535d5a45015c (patch) | |
| tree | 583f67dac21d19645da55904e77af452ebed0d18 /src/multimedia/playback/qmedianetworkplaylistprovider_p.h | |
| parent | d97d618a4884c2535ba787e774f0faa6bce82081 (diff) | |
| parent | 21f752806077e05249f9c357f14e9f0294920ecb (diff) | |
| download | qtmultimedia-95818e11936e8c85172b2675132a535d5a45015c.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ieff29d391f5be959829ccc1cca61efb04c50fc97
Diffstat (limited to 'src/multimedia/playback/qmedianetworkplaylistprovider_p.h')
0 files changed, 0 insertions, 0 deletions