diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-09-25 18:55:25 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-09-25 18:55:25 +0200 |
commit | 1e2702e86dbd2b3de69c58438bcfcf6276124547 (patch) | |
tree | f1f79f2dbfa93f6ef4a3ea296cba2330a0c8556a /src/plugins/qnx/mediaplayer/mmrenderermediaplayerservice.cpp | |
parent | 94a204b4775d750ed30d56f333d5433ef3e0b27e (diff) | |
parent | 020e7b4c198f5e74dd83da7fa8e64a02b14af2f9 (diff) |
Merge 5.9 into 5.9.2v5.9.2
Change-Id: Ia35d6229b7c9889bdbaea72decc78e927ca0f2db
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 e253c68d8..1258d199c 100644 --- a/src/plugins/qnx/mediaplayer/mmrenderermediaplayerservice.cpp +++ b/src/plugins/qnx/mediaplayer/mmrenderermediaplayerservice.cpp @@ -44,7 +44,7 @@ #include "mmrendererutil.h" #include "mmrenderervideowindowcontrol.h" -#include "ppsmediaplayercontrol.h" +#include "mmreventmediaplayercontrol.h" QT_BEGIN_NAMESPACE @@ -72,7 +72,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; |