slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/5.3' into 5.4

Browse Source 
Change-Id: I716fd3acb69e424047691069cd4a781f656d0487
This commit is contained in:
Frederik Gladhorn
2014-10-14 14:05:02 +02:00
parent ca94dc79b6 2d911d4e09
commit e128207f75
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qnx/mediaplayer/mmrendererplayervideorenderercontrol.cpp
View File

@@ -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));
}