diff options
author | Christian Strømme <christian.stromme@qt.io> | 2017-09-26 15:43:23 +0200 |
---|---|---|
committer | Christian Strømme <christian.stromme@qt.io> | 2017-09-26 15:43:23 +0200 |
commit | 2972eaa1330f377a7c3b1f583a643dbfbfc9531e (patch) | |
tree | b3407be7bba8c50df76a550c5c2867061c6dea95 /src/plugins/qnx/mediaplayer/mmrenderermediaplayerservice.cpp | |
parent | 230f070c7ed353605260f9fa79d0a5bc5181321c (diff) | |
parent | 51b361faa703e157feaa0cfd79e7d473cb704811 (diff) | |
download | qtmultimedia-2972eaa1330f377a7c3b1f583a643dbfbfc9531e.tar.gz |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: Ib7c41a4cd7fd6976ebab52673898888dfac53db5
Diffstat (limited to 'src/plugins/qnx/mediaplayer/mmrenderermediaplayerservice.cpp')
-rw-r--r-- | src/plugins/qnx/mediaplayer/mmrenderermediaplayerservice.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qnx/mediaplayer/mmrenderermediaplayerservice.cpp b/src/plugins/qnx/mediaplayer/mmrenderermediaplayerservice.cpp index 6136f9465..257c437ce 100644 --- a/src/plugins/qnx/mediaplayer/mmrenderermediaplayerservice.cpp +++ b/src/plugins/qnx/mediaplayer/mmrenderermediaplayerservice.cpp @@ -45,7 +45,7 @@ #include "mmrendererutil.h" #include "mmrenderervideowindowcontrol.h" -#include "ppsmediaplayercontrol.h" +#include "mmreventmediaplayercontrol.h" QT_BEGIN_NAMESPACE @@ -74,7 +74,7 @@ QMediaControl *MmRendererMediaPlayerService::requestControl(const char *name) { if (qstrcmp(name, QMediaPlayerControl_iid) == 0) { if (!m_mediaPlayerControl) { - m_mediaPlayerControl = new PpsMediaPlayerControl; + m_mediaPlayerControl = new MmrEventMediaPlayerControl; updateControls(); } return m_mediaPlayerControl; |