diff options
author | Liang Qi <liang.qi@qt.io> | 2016-05-13 11:02:04 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-05-13 11:02:04 +0200 |
commit | 49461f9cffa5439e536a844ec3a0134c252141e6 (patch) | |
tree | 3d645b3c8fe5d9b374c6df8e12705ee090596d42 /src/qtmultimediaquicktools | |
parent | 7b0cae6c4f9f417e14a1553cd206bd929d299dbb (diff) | |
parent | 08e13bfcdb23eabfbc47bca7499b0b8aadce0ac7 (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I773db005bbdc511169917ee35eb5b517e898926b
Diffstat (limited to 'src/qtmultimediaquicktools')
-rw-r--r-- | src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp b/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp index 96290aed0..412694cc3 100644 --- a/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp +++ b/src/qtmultimediaquicktools/qdeclarativevideooutput_render.cpp @@ -289,16 +289,6 @@ QSGNode *QDeclarativeVideoRendererBackend::updatePaintNode(QSGNode *oldNode, obj->event(&ev); } } -#if defined (Q_OS_QNX) // On QNX we need to be called back again for creating the egl images - else { - // Internal mechanism to call back the surface renderer from the QtQuick render thread - QObject *obj = m_surface->property("_q_GLThreadCallback").value<QObject*>(); - if (obj) { - QEvent ev(static_cast<QEvent::Type>(QEvent::User + 1)); - obj->event(&ev); - } - } -#endif bool isFrameModified = false; if (m_frameChanged) { |