Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ia422f45b49177dbfdaa1129e18dbfd9769e63e73

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 \

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

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