diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-14 14:05:02 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-14 14:05:02 +0200 |
| commit | e128207f753da7f98cb4906775ad517cbbb0c4fb (patch) | |
| tree | 1b2bfdc45cdbdcb7164529a8ae7d3fee6e46bb57 /src/plugins/qnx/mediaplayer/mmrendererplayervideorenderercontrol.cpp | |
| parent | ca94dc79b6f0e57ba7446a87c70398a178fbcac8 (diff) | |
| parent | 2d911d4e0926969528be8e170a02f74f4761ee25 (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Change-Id: I716fd3acb69e424047691069cd4a781f656d0487
Diffstat (limited to 'src/plugins/qnx/mediaplayer/mmrendererplayervideorenderercontrol.cpp')
| -rw-r--r-- | src/plugins/qnx/mediaplayer/mmrendererplayervideorenderercontrol.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qnx/mediaplayer/mmrendererplayervideorenderercontrol.cpp b/src/plugins/qnx/mediaplayer/mmrendererplayervideorenderercontrol.cpp index e48cba794..f95cd8a99 100644 --- a/src/plugins/qnx/mediaplayer/mmrendererplayervideorenderercontrol.cpp +++ b/src/plugins/qnx/mediaplayer/mmrendererplayervideorenderercontrol.cpp @@ -70,7 +70,7 @@ void MmRendererPlayerVideoRendererControl::setSurface(QAbstractVideoSurface *sur m_surface = QPointer<QAbstractVideoSurface>(surface); if (QOpenGLContext::currentContext()) m_windowGrabber->checkForEglImageExtension(); - else + else if (m_surface) m_surface->setProperty("_q_GLThreadCallback", QVariant::fromValue<QObject*>(this)); } |