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

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

Browse Source 
Change-Id: Ia422f45b49177dbfdaa1129e18dbfd9769e63e73
This commit is contained in:
Frederik Gladhorn
2014-02-24 20:04:06 +01:00
parent 41d41ceb4a 92323612d0
commit ed43209f42
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/multimedia/multimedia.pro
View File

@@ -64,7 +64,9 @@ ANDROID_PERMISSIONS += \
android.permission.CAMERA \ android.permission.CAMERA \
android.permission.RECORD_AUDIO android.permission.RECORD_AUDIO
ANDROID_FEATURES += \ ANDROID_FEATURES += \
android.hardware.camera android.hardware.camera \
android.hardware.camera.autofocus \
android.hardware.microphone
MODULE_PLUGIN_TYPES = \ MODULE_PLUGIN_TYPES = \
mediaservice \ mediaservice \
audio \ audio \

12
src/plugins/qnx/mediaplayer/mmrenderervideowindowcontrol.cpp
View File

@@ -207,10 +207,18 @@ void MmRendererVideoWindowControl::attachDisplay(mmr_context_t *context)
return; 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 *>( const char * const groupNameData = static_cast<const char *>(
nativeInterface->nativeResourceForWindow("windowGroup", window)); nativeInterface->nativeResourceForWindow("windowGroup", windowForGroup));
if (!groupNameData) { if (!groupNameData) {
qDebug() << "MmRendererVideoWindowControl: Unable to find window group for window" << window; qDebug() << "MmRendererVideoWindowControl: Unable to find window group for window"
<< windowForGroup;
return; return;
} }

3
src/plugins/wmf/wmf.pro
View File

@@ -4,6 +4,9 @@ qtHaveModule(widgets) {
QT += multimediawidgets-private QT += multimediawidgets-private
DEFINES += HAVE_WIDGETS DEFINES += HAVE_WIDGETS
} }
win32:!qtHaveModule(opengl) {
LIBS_PRIVATE += -lgdi32 -luser32
}
PLUGIN_TYPE=mediaservice PLUGIN_TYPE=mediaservice
PLUGIN_CLASS_NAME = WMFServicePlugin PLUGIN_CLASS_NAME = WMFServicePlugin