diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2016-03-17 16:05:28 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2016-03-17 16:05:28 +0100 |
| commit | 812ab8e6a33d9327e982b0f05cedaaa7e9d04f54 (patch) | |
| tree | ddad9c7a390d1506f633dc5665c38c9904e2f539 /src/plugins/wmf | |
| parent | b17e0cd5dd28b93b1ea567c676f0e183acb6dd7c (diff) | |
| parent | 9985224a89b830dc182b428f491b6187d6f0e1ba (diff) | |
Merge remote-tracking branch 'origin/5.6.0' into 5.6
Change-Id: I91fb2886b4ab8f0b9e2e28329cec69dfa2cb5435
Diffstat (limited to 'src/plugins/wmf')
| -rw-r--r-- | src/plugins/wmf/player/mfaudioendpointcontrol.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/wmf/player/mfaudioendpointcontrol.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/wmf/player/mfaudioendpointcontrol.cpp b/src/plugins/wmf/player/mfaudioendpointcontrol.cpp index 7178a75c1..939b98f0d 100644 --- 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) diff --git a/src/plugins/wmf/player/mfaudioendpointcontrol.h b/src/plugins/wmf/player/mfaudioendpointcontrol.h index d0186a4ac..18791e1c3 100644 --- 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" |