Merge remote-tracking branch 'origin/5.6.0' into 5.6

Change-Id: I91fb2886b4ab8f0b9e2e28329cec69dfa2cb5435
2016-03-17 16:05:28 +01:00
parent b17e0cd5dd 9985224a89
commit 812ab8e6a3
17 changed files with 150 additions and 63 deletions
--- a/src/plugins/wmf/player/mfaudioendpointcontrol.cpp
+++ b/src/plugins/wmf/player/mfaudioendpointcontrol.cpp
@@ -34,6 +34,8 @@
 #include "QtCore/qdebug.h"
 #include "mfaudioendpointcontrol.h"

+#include <mmdeviceapi.h>
+
 MFAudioEndpointControl::MFAudioEndpointControl(QObject *parent)
    : QAudioOutputSelectorControl(parent)
    , m_currentActivate(0)
--- a/src/plugins/wmf/player/mfaudioendpointcontrol.h
+++ b/src/plugins/wmf/player/mfaudioendpointcontrol.h
@@ -36,7 +36,6 @@

 #include <mfapi.h>
 #include <mfidl.h>
-#include <mmdeviceapi.h>

 #include "qaudiooutputselectorcontrol.h"