Merge "MediaPLayer: remove unused code" into qt-dev