summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Osterfeld <frank.osterfeld.qnx@kdab.com>2013-11-28 17:06:17 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-19 16:26:35 +0100
commit01f8ff383410fd7c3ab54dac77e55db37c58e10f (patch)
treef1e94231cd334680d48e095f8391264e23a1c849
parent13882cd5da72bf0f6657752344793103a43a8e41 (diff)
downloadqtmultimedia-01f8ff383410fd7c3ab54dac77e55db37c58e10f.tar.gz
QNX: Use window group of top-level window for mmr
Pass the top-level window's window group to mm-renderer, as required by mmr. Change-Id: I2a2e8b4aa48f5c2292b03593c6d528068f383b5c Reviewed-by: Bernd Weimer <bweimer@blackberry.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
-rw-r--r--src/plugins/qnx/mediaplayer/mmrenderervideowindowcontrol.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/plugins/qnx/mediaplayer/mmrenderervideowindowcontrol.cpp b/src/plugins/qnx/mediaplayer/mmrenderervideowindowcontrol.cpp
index c35c6d1ad..ef74cbab0 100644
--- a/src/plugins/qnx/mediaplayer/mmrenderervideowindowcontrol.cpp
+++ b/src/plugins/qnx/mediaplayer/mmrenderervideowindowcontrol.cpp
@@ -207,10 +207,18 @@ void MmRendererVideoWindowControl::attachDisplay(mmr_context_t *context)
return;
}
+ QWindow *windowForGroup = window;
+
+ //According to mmr_output_attach() documentation, the window group name of the
+ //application's top-level window is expected.
+ while (windowForGroup->parent())
+ windowForGroup = windowForGroup->parent();
+
const char * const groupNameData = static_cast<const char *>(
- nativeInterface->nativeResourceForWindow("windowGroup", window));
+ nativeInterface->nativeResourceForWindow("windowGroup", windowForGroup));
if (!groupNameData) {
- qDebug() << "MmRendererVideoWindowControl: Unable to find window group for window" << window;
+ qDebug() << "MmRendererVideoWindowControl: Unable to find window group for window"
+ << windowForGroup;
return;
}