From 391e8a7147edb1cdff6f1362ae0d3be4e7271ea7 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Tue, 11 Feb 2014 00:24:58 +0100 Subject: [PATCH 1/3] Fix linking problem when built with -no-opengl When -no-opengl was used then it was not automatically pulling in the needed Windows libraries as it was not loading opengl.prf to get them from. Change-Id: I9b73e5ee01da964a64c71b6261ff4ed98ce6f1a9 Reviewed-by: Yoann Lopes --- src/plugins/wmf/wmf.pro | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/plugins/wmf/wmf.pro b/src/plugins/wmf/wmf.pro index a26f319b..b1d157a9 100644 --- a/src/plugins/wmf/wmf.pro +++ b/src/plugins/wmf/wmf.pro @@ -4,6 +4,9 @@ qtHaveModule(widgets) { QT += multimediawidgets-private DEFINES += HAVE_WIDGETS } +win32:!qtHaveModule(opengl) { + LIBS_PRIVATE += -lgdi32 -luser32 +} PLUGIN_TYPE=mediaservice PLUGIN_CLASS_NAME = WMFServicePlugin From 01f8ff383410fd7c3ab54dac77e55db37c58e10f Mon Sep 17 00:00:00 2001 From: Frank Osterfeld Date: Thu, 28 Nov 2013 17:06:17 +0100 Subject: [PATCH 2/3] 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 Reviewed-by: Rafael Roquetto Reviewed-by: Fabian Bumberger --- .../qnx/mediaplayer/mmrenderervideowindowcontrol.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/plugins/qnx/mediaplayer/mmrenderervideowindowcontrol.cpp b/src/plugins/qnx/mediaplayer/mmrenderervideowindowcontrol.cpp index c35c6d1a..ef74cbab 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( - 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; } From 92323612d01e9bd6438fb9da0dd810c6dad045a3 Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Fri, 21 Feb 2014 14:18:34 +0100 Subject: [PATCH 3/3] android: add missing feature tags. Adding the CAMERA and RECORD_AUDIO permissions implicitely makes some features a hard requirement for the app. By adding these features in the .pro file, androiddeployqt will mark them as unrequired in the final package. Change-Id: Ie9357d05626cb12272001d63b04e230737fbf1bc Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/multimedia/multimedia.pro | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro index e5334937..5ed0cefc 100644 --- a/src/multimedia/multimedia.pro +++ b/src/multimedia/multimedia.pro @@ -64,7 +64,9 @@ ANDROID_PERMISSIONS += \ android.permission.CAMERA \ android.permission.RECORD_AUDIO ANDROID_FEATURES += \ - android.hardware.camera + android.hardware.camera \ + android.hardware.camera.autofocus \ + android.hardware.microphone MODULE_PLUGIN_TYPES = \ mediaservice \ audio \