Move the windows backend into a plugin

Change-Id: Ib420cf25bce4565572a62dd447a94712c9970e51
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

70 files changed, 163 insertions, 144 deletions

diff --git a/src/multimedia/CMakeLists.txt b/src/multimedia/CMakeLists.txt
index c753b1d37..cc96a282b 100644
--- a/src/multimedia/CMakeLists.txt
+++ b/src/multimedia/CMakeLists.txt
@@ -96,84 +96,6 @@ qt_internal_add_simd_part(Multimedia SIMD avx2
         video/qvideoframeconversionhelper_avx2.cpp
 )
 
-
-qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_wmf
-    SOURCES
-        platform/windows/audio/qwindowsaudiodevice.cpp platform/windows/audio/qwindowsaudiodevice_p.h
-        platform/windows/audio/qwindowsaudiosource.cpp platform/windows/audio/qwindowsaudiosource_p.h
-        platform/windows/audio/qwindowsaudiosink.cpp platform/windows/audio/qwindowsaudiosink_p.h
-        platform/windows/audio/qwindowsaudioutils.cpp platform/windows/audio/qwindowsaudioutils_p.h
-        platform/windows/common/mfmetadata.cpp platform/windows/common/mfmetadata_p.h
-        platform/windows/common/qwindowsmultimediautils.cpp platform/windows/common/qwindowsmultimediautils_p.h
-        platform/windows/common/qwindowsmfdefs.cpp platform/windows/common/qwindowsmfdefs_p.h
-        platform/windows/common/qwindowsiupointer_p.h
-        platform/windows/common/qwindowsresampler.cpp platform/windows/common/qwindowsresampler_p.h
-        platform/windows/decoder/mfaudiodecodercontrol.cpp platform/windows/decoder/mfaudiodecodercontrol_p.h
-        platform/windows/decoder/mfdecodersourcereader.cpp platform/windows/decoder/mfdecodersourcereader_p.h
-        platform/windows/evr/evrcustompresenter.cpp platform/windows/evr/evrcustompresenter_p.h
-        platform/windows/evr/evrd3dpresentengine.cpp platform/windows/evr/evrd3dpresentengine_p.h
-        platform/windows/evr/evrhelpers.cpp platform/windows/evr/evrhelpers_p.h
-        platform/windows/evr/evrvideowindowcontrol.cpp platform/windows/evr/evrvideowindowcontrol_p.h
-        platform/windows/mfstream.cpp platform/windows/mfstream_p.h
-        platform/windows/player/mfactivate.cpp platform/windows/player/mfactivate_p.h
-        platform/windows/player/mfevrvideowindowcontrol.cpp platform/windows/player/mfevrvideowindowcontrol_p.h
-        platform/windows/player/mfplayercontrol.cpp platform/windows/player/mfplayercontrol_p.h
-        platform/windows/player/mfplayersession.cpp platform/windows/player/mfplayersession_p.h
-        platform/windows/player/mftvideo.cpp platform/windows/player/mftvideo_p.h
-        platform/windows/player/mfvideorenderercontrol.cpp platform/windows/player/mfvideorenderercontrol_p.h
-        platform/windows/player/samplegrabber.cpp platform/windows/player/samplegrabber_p.h
-        platform/windows/mediacapture/qwindowscamera.cpp
-        platform/windows/mediacapture/qwindowscamera_p.h
-        platform/windows/mediacapture/qwindowsimagecapture.cpp
-        platform/windows/mediacapture/qwindowsimagecapture_p.h
-        platform/windows/mediacapture/qwindowsmediacapture.cpp
-        platform/windows/mediacapture/qwindowsmediacapture_p.h
-        platform/windows/mediacapture/qwindowsmediadevicereader.cpp
-        platform/windows/mediacapture/qwindowsmediadevicereader_p.h
-        platform/windows/mediacapture/qwindowsmediadevicesession.cpp
-        platform/windows/mediacapture/qwindowsmediadevicesession_p.h
-        platform/windows/mediacapture/qwindowsmediaencoder.cpp
-        platform/windows/mediacapture/qwindowsmediaencoder_p.h
-        platform/windows/qwindowsmediadevices.cpp platform/windows/qwindowsmediadevices_p.h
-        platform/windows/qwindowsformatinfo.cpp platform/windows/qwindowsformatinfo_p.h
-        platform/windows/qwindowsintegration.cpp platform/windows/qwindowsintegration_p.h
-        platform/windows/sourceresolver.cpp platform/windows/sourceresolver_p.h
-    INCLUDE_DIRECTORIES
-        platform/windows/common
-        platform/windows/decoder
-        platform/windows/evr
-        platform/windows/player
-        platform/windows/mediacapture
-    LIBRARIES
-        uuid
-        WMF::WMF
-        d3d9
-        dxva2
-        evr
-        gdi32
-        ksuser
-        mf
-        mfcore
-        mfplat
-        mfreadwrite
-        mfuuid
-        ole32
-        oleaut32
-        propsys
-        shlwapi
-        strmiids
-        amstrmid
-        user32
-        winmm
-        wmcodecdspuuid
-)
-
-qt_internal_extend_target(Multimedia CONDITION WIN32
-    LIBRARIES
-        gdi32
-        user32
-)
-
 qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_mmrenderer
     SOURCES
         platform/qnx/audio/neutrinoserviceplugin.cpp platform/qnx/audio/neutrinoserviceplugin_p.h
diff --git a/src/multimedia/platform/qplatformmediaintegration.cpp b/src/multimedia/platform/qplatformmediaintegration.cpp
index 7f84d82bc..c39898409 100644
--- a/src/multimedia/platform/qplatformmediaintegration.cpp
+++ b/src/multimedia/platform/qplatformmediaintegration.cpp
@@ -48,10 +48,6 @@
 #include "QtCore/private/qfactoryloader_p.h"
 #include "qplatformmediaplugin_p.h"
 
-#if QT_CONFIG(wmf)
-#include <private/qwindowsintegration_p.h>
-using PlatformIntegration = QWindowsMediaIntegration;
-#else
 class QDummyIntegration : public QPlatformMediaIntegration
 {
 public:
@@ -59,8 +55,6 @@ public:
     QPlatformMediaDevices *devices() override { return nullptr; }
     QPlatformMediaFormatInfo *formatInfo() override { return nullptr; }
 };
-using PlatformIntegration = QDummyIntegration;
-#endif
 
 Q_LOGGING_CATEGORY(qLcMediaPlugin, "qt.multimedia.plugin")
 
@@ -118,8 +112,8 @@ QPlatformMediaIntegration *QPlatformMediaIntegration::instance()
     holder.nativeInstance = qLoadPlugin<QPlatformMediaIntegration, QPlatformMediaPlugin>(loader(), type);
 
     if (!holder.nativeInstance) {
-        qCDebug(qLcMediaPlugin) << "could not load plugins, loading fallback";
-        holder.nativeInstance = new PlatformIntegration;
+        qWarning() << "could not load multimedia backend" << type;
+        holder.nativeInstance = new QDummyIntegration;
     }
 
     holder.instance = holder.nativeInstance;
diff --git a/src/plugins/multimedia/CMakeLists.txt b/src/plugins/multimedia/CMakeLists.txt
index 33ed5f781..c3b1eb6a7 100644
--- a/src/plugins/multimedia/CMakeLists.txt
+++ b/src/plugins/multimedia/CMakeLists.txt
@@ -13,3 +13,6 @@ endif ()
 if (APPLE AND NOT WATCHOS)
     add_subdirectory(darwin)
 endif ()
+if (QT_FEATURE_wmf)
+    add_subdirectory(windows)
+endif ()
diff --git a/src/plugins/multimedia/windows/CMakeLists.txt b/src/plugins/multimedia/windows/CMakeLists.txt
new file mode 100644
index 000000000..941d20ecf
--- /dev/null
+++ b/src/plugins/multimedia/windows/CMakeLists.txt
@@ -0,0 +1,76 @@
+qt_internal_add_plugin(QWindowsMediaPlugin
+    OUTPUT_NAME windowsmediaplugin
+    PLUGIN_TYPE multimedia
+    SOURCES
+        audio/qwindowsaudiodevice.cpp audio/qwindowsaudiodevice_p.h
+        audio/qwindowsaudiosource.cpp audio/qwindowsaudiosource_p.h
+        audio/qwindowsaudiosink.cpp audio/qwindowsaudiosink_p.h
+        audio/qwindowsaudioutils.cpp audio/qwindowsaudioutils_p.h
+        common/mfmetadata.cpp common/mfmetadata_p.h
+        common/qwindowsmultimediautils.cpp common/qwindowsmultimediautils_p.h
+        common/qwindowsmfdefs.cpp common/qwindowsmfdefs_p.h
+        common/qwindowsiupointer_p.h
+        common/qwindowsresampler.cpp common/qwindowsresampler_p.h
+        decoder/mfaudiodecodercontrol.cpp decoder/mfaudiodecodercontrol_p.h
+        decoder/mfdecodersourcereader.cpp decoder/mfdecodersourcereader_p.h
+        evr/evrcustompresenter.cpp evr/evrcustompresenter_p.h
+        evr/evrd3dpresentengine.cpp evr/evrd3dpresentengine_p.h
+        evr/evrhelpers.cpp evr/evrhelpers_p.h
+        evr/evrvideowindowcontrol.cpp evr/evrvideowindowcontrol_p.h
+        mfstream.cpp mfstream_p.h
+        player/mfactivate.cpp player/mfactivate_p.h
+        player/mfevrvideowindowcontrol.cpp player/mfevrvideowindowcontrol_p.h
+        player/mfplayercontrol.cpp player/mfplayercontrol_p.h
+        player/mfplayersession.cpp player/mfplayersession_p.h
+        player/mftvideo.cpp player/mftvideo_p.h
+        player/mfvideorenderercontrol.cpp player/mfvideorenderercontrol_p.h
+        player/samplegrabber.cpp player/samplegrabber_p.h
+        mediacapture/qwindowscamera.cpp
+        mediacapture/qwindowscamera_p.h
+        mediacapture/qwindowsimagecapture.cpp
+        mediacapture/qwindowsimagecapture_p.h
+        mediacapture/qwindowsmediacapture.cpp
+        mediacapture/qwindowsmediacapture_p.h
+        mediacapture/qwindowsmediadevicereader.cpp
+        mediacapture/qwindowsmediadevicereader_p.h
+        mediacapture/qwindowsmediadevicesession.cpp
+        mediacapture/qwindowsmediadevicesession_p.h
+        mediacapture/qwindowsmediaencoder.cpp
+        mediacapture/qwindowsmediaencoder_p.h
+        qwindowsmediadevices.cpp qwindowsmediadevices_p.h
+        qwindowsformatinfo.cpp qwindowsformatinfo_p.h
+        qwindowsintegration.cpp qwindowsintegration_p.h
+        sourceresolver.cpp sourceresolver_p.h
+    INCLUDE_DIRECTORIES
+        audio
+        common
+        decoder
+        evr
+        player
+        mediacapture
+    LIBRARIES
+        Qt::MultimediaPrivate
+        Qt::CorePrivate
+        uuid
+        WMF::WMF
+        d3d9
+        dxva2
+        evr
+        gdi32
+        ksuser
+        mf
+        mfcore
+        mfplat
+        mfreadwrite
+        mfuuid
+        ole32
+        oleaut32
+        propsys
+        shlwapi
+        strmiids
+        amstrmid
+        user32
+        winmm
+        wmcodecdspuuid
+)
+
diff --git a/src/multimedia/platform/windows/audio/qwindowsaudiodevice.cpp b/src/plugins/multimedia/windows/audio/qwindowsaudiodevice.cpp
index 1942dd8a6..1942dd8a6 100644
--- a/src/multimedia/platform/windows/audio/qwindowsaudiodevice.cpp
+++ b/src/plugins/multimedia/windows/audio/qwindowsaudiodevice.cpp
diff --git a/src/multimedia/platform/windows/audio/qwindowsaudiodevice_p.h b/src/plugins/multimedia/windows/audio/qwindowsaudiodevice_p.h
index 7bb34d08f..b62e5eb66 100644
--- a/src/multimedia/platform/windows/audio/qwindowsaudiodevice_p.h
+++ b/src/plugins/multimedia/windows/audio/qwindowsaudiodevice_p.h
@@ -60,7 +60,7 @@
 #include <QtMultimedia/qaudiodevice.h>
 #include <private/qaudiosystem_p.h>
 #include <private/qaudiodevice_p.h>
-#include <private/qwindowsiupointer_p.h>
+#include <qwindowsiupointer_p.h>
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/platform/windows/audio/qwindowsaudiosink.cpp b/src/plugins/multimedia/windows/audio/qwindowsaudiosink.cpp
index 046a91ab0..046a91ab0 100644
--- a/src/multimedia/platform/windows/audio/qwindowsaudiosink.cpp
+++ b/src/plugins/multimedia/windows/audio/qwindowsaudiosink.cpp
diff --git a/src/multimedia/platform/windows/audio/qwindowsaudiosink_p.h b/src/plugins/multimedia/windows/audio/qwindowsaudiosink_p.h
index 0ae4beb69..6910a1385 100644
--- a/src/multimedia/platform/windows/audio/qwindowsaudiosink_p.h
+++ b/src/plugins/multimedia/windows/audio/qwindowsaudiosink_p.h
@@ -65,8 +65,8 @@
 #include <QtMultimedia/qaudio.h>
 #include <QtMultimedia/qaudiodevice.h>
 #include <private/qaudiosystem_p.h>
-#include <private/qwindowsiupointer_p.h>
-#include <private/qwindowsresampler_p.h>
+#include <qwindowsiupointer_p.h>
+#include <qwindowsresampler_p.h>
 
 #include <queue>
 #include <utility>
diff --git a/src/multimedia/platform/windows/audio/qwindowsaudiosource.cpp b/src/plugins/multimedia/windows/audio/qwindowsaudiosource.cpp
index d86b27157..d86b27157 100644
--- a/src/multimedia/platform/windows/audio/qwindowsaudiosource.cpp
+++ b/src/plugins/multimedia/windows/audio/qwindowsaudiosource.cpp
diff --git a/src/multimedia/platform/windows/audio/qwindowsaudiosource_p.h b/src/plugins/multimedia/windows/audio/qwindowsaudiosource_p.h
index 17bbdaaee..17bbdaaee 100644
--- a/src/multimedia/platform/windows/audio/qwindowsaudiosource_p.h
+++ b/src/plugins/multimedia/windows/audio/qwindowsaudiosource_p.h
diff --git a/src/multimedia/platform/windows/audio/qwindowsaudioutils.cpp b/src/plugins/multimedia/windows/audio/qwindowsaudioutils.cpp
index 41c27a28f..41c27a28f 100644
--- a/src/multimedia/platform/windows/audio/qwindowsaudioutils.cpp
+++ b/src/plugins/multimedia/windows/audio/qwindowsaudioutils.cpp
diff --git a/src/multimedia/platform/windows/audio/qwindowsaudioutils_p.h b/src/plugins/multimedia/windows/audio/qwindowsaudioutils_p.h
index 1ee581d17..07a618db7 100644
--- a/src/multimedia/platform/windows/audio/qwindowsaudioutils_p.h
+++ b/src/plugins/multimedia/windows/audio/qwindowsaudioutils_p.h
@@ -53,7 +53,7 @@
 
 #include <qaudioformat.h>
 #include <QtCore/qt_windows.h>
-#include <private/qwindowsiupointer_p.h>
+#include <qwindowsiupointer_p.h>
 #include <mfapi.h>
 #include <mmsystem.h>
 #include <mmreg.h>
diff --git a/src/multimedia/platform/windows/common/mfmetadata.cpp b/src/plugins/multimedia/windows/common/mfmetadata.cpp
index 1df53519f..1df53519f 100644
--- a/src/multimedia/platform/windows/common/mfmetadata.cpp
+++ b/src/plugins/multimedia/windows/common/mfmetadata.cpp
diff --git a/src/multimedia/platform/windows/common/mfmetadata_p.h b/src/plugins/multimedia/windows/common/mfmetadata_p.h
index d1846e9c5..d1846e9c5 100644
--- a/src/multimedia/platform/windows/common/mfmetadata_p.h
+++ b/src/plugins/multimedia/windows/common/mfmetadata_p.h
diff --git a/src/multimedia/platform/windows/common/qwindowsiupointer_p.h b/src/plugins/multimedia/windows/common/qwindowsiupointer_p.h
index 9e9cf6894..9e9cf6894 100644
--- a/src/multimedia/platform/windows/common/qwindowsiupointer_p.h
+++ b/src/plugins/multimedia/windows/common/qwindowsiupointer_p.h
diff --git a/src/multimedia/platform/windows/common/qwindowsmfdefs.cpp b/src/plugins/multimedia/windows/common/qwindowsmfdefs.cpp
index 97eae9743..97eae9743 100644
--- a/src/multimedia/platform/windows/common/qwindowsmfdefs.cpp
+++ b/src/plugins/multimedia/windows/common/qwindowsmfdefs.cpp
diff --git a/src/multimedia/platform/windows/common/qwindowsmfdefs_p.h b/src/plugins/multimedia/windows/common/qwindowsmfdefs_p.h
index 173c8f8f0..173c8f8f0 100644
--- a/src/multimedia/platform/windows/common/qwindowsmfdefs_p.h
+++ b/src/plugins/multimedia/windows/common/qwindowsmfdefs_p.h
diff --git a/src/multimedia/platform/windows/common/qwindowsmultimediautils.cpp b/src/plugins/multimedia/windows/common/qwindowsmultimediautils.cpp
index 3c2f40d48..b83233893 100644
--- a/src/multimedia/platform/windows/common/qwindowsmultimediautils.cpp
+++ b/src/plugins/multimedia/windows/common/qwindowsmultimediautils.cpp
@@ -48,7 +48,7 @@
 
 #include <mfapi.h>
 #include <mfidl.h>
-#include <private/qwindowsmfdefs_p.h>
+#include <qwindowsmfdefs_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/multimedia/platform/windows/common/qwindowsmultimediautils_p.h b/src/plugins/multimedia/windows/common/qwindowsmultimediautils_p.h
index 100059cf0..100059cf0 100644
--- a/src/multimedia/platform/windows/common/qwindowsmultimediautils_p.h
+++ b/src/plugins/multimedia/windows/common/qwindowsmultimediautils_p.h
diff --git a/src/multimedia/platform/windows/common/qwindowsresampler.cpp b/src/plugins/multimedia/windows/common/qwindowsresampler.cpp
index 74e85b3b2..72be7923f 100644
--- a/src/multimedia/platform/windows/common/qwindowsresampler.cpp
+++ b/src/plugins/multimedia/windows/common/qwindowsresampler.cpp
@@ -38,7 +38,7 @@
 ****************************************************************************/
 
 #include "qwindowsresampler_p.h"
-#include <private/qwindowsaudioutils_p.h>
+#include <qwindowsaudioutils_p.h>
 #include <qloggingcategory.h>
 
 #include <Wmcodecdsp.h>
diff --git a/src/multimedia/platform/windows/common/qwindowsresampler_p.h b/src/plugins/multimedia/windows/common/qwindowsresampler_p.h
index 4b586f4ec..eb5241f39 100644
--- a/src/multimedia/platform/windows/common/qwindowsresampler_p.h
+++ b/src/plugins/multimedia/windows/common/qwindowsresampler_p.h
@@ -55,7 +55,7 @@
 #include <qbytearray.h>
 #include <qbytearrayview.h>
 #include <qaudioformat.h>
-#include <private/qwindowsiupointer_p.h>
+#include <qwindowsiupointer_p.h>
 #include <qt_windows.h>
 
 class QWindowsResampler
diff --git a/src/multimedia/platform/windows/decoder/mfaudiodecodercontrol.cpp b/src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol.cpp
index 7cc162204..b756668c1 100644
--- a/src/multimedia/platform/windows/decoder/mfaudiodecodercontrol.cpp
+++ b/src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol.cpp
@@ -42,7 +42,7 @@
 #include <qglobal.h>
 #include "Wmcodecdsp.h"
 #include "mfaudiodecodercontrol_p.h"
-#include <private/qwindowsaudioutils_p.h>
+#include <qwindowsaudioutils_p.h>
 
 MFAudioDecoderControl::MFAudioDecoderControl(QAudioDecoder *parent)
     : QPlatformAudioDecoder(parent)
diff --git a/src/multimedia/platform/windows/decoder/mfaudiodecodercontrol_p.h b/src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol_p.h
index 0bb2fedcc..05116a7e5 100644
--- a/src/multimedia/platform/windows/decoder/mfaudiodecodercontrol_p.h
+++ b/src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol_p.h
@@ -53,9 +53,9 @@
 
 #include "mfdecodersourcereader_p.h"
 #include <private/qplatformaudiodecoder_p.h>
-#include <private/sourceresolver_p.h>
-#include <private/qwindowsiupointer_p.h>
-#include <private/qwindowsresampler_p.h>
+#include <sourceresolver_p.h>
+#include <qwindowsiupointer_p.h>
+#include <qwindowsresampler_p.h>
 
 QT_USE_NAMESPACE
 
diff --git a/src/multimedia/platform/windows/decoder/mfdecodersourcereader.cpp b/src/plugins/multimedia/windows/decoder/mfdecodersourcereader.cpp
index e0b54dcde..e0b54dcde 100644
--- a/src/multimedia/platform/windows/decoder/mfdecodersourcereader.cpp
+++ b/src/plugins/multimedia/windows/decoder/mfdecodersourcereader.cpp
diff --git a/src/multimedia/platform/windows/decoder/mfdecodersourcereader_p.h b/src/plugins/multimedia/windows/decoder/mfdecodersourcereader_p.h
index da35f466e..0393e5c17 100644
--- a/src/multimedia/platform/windows/decoder/mfdecodersourcereader_p.h
+++ b/src/plugins/multimedia/windows/decoder/mfdecodersourcereader_p.h
@@ -57,7 +57,7 @@
 
 #include <QtCore/qobject.h>
 #include "qaudioformat.h"
-#include <private/qwindowsiupointer_p.h>
+#include <qwindowsiupointer_p.h>
 
 QT_USE_NAMESPACE
 
diff --git a/src/multimedia/platform/windows/evr/evrcustompresenter.cpp b/src/plugins/multimedia/windows/evr/evrcustompresenter.cpp
index e8b99a09f..c46f74a26 100644
--- a/src/multimedia/platform/windows/evr/evrcustompresenter.cpp
+++ b/src/plugins/multimedia/windows/evr/evrcustompresenter.cpp
@@ -41,9 +41,9 @@
 
 #include "evrd3dpresentengine_p.h"
 #include "evrhelpers_p.h"
-#include <private/qwindowsmultimediautils_p.h>
+#include <qwindowsmultimediautils_p.h>
 #include <private/qplatformvideosink_p.h>
-#include <private/qwindowsmfdefs_p.h>
+#include <qwindowsmfdefs_p.h>
 
 #include <QtGui/private/qrhi_p.h>
 
diff --git a/src/multimedia/platform/windows/evr/evrcustompresenter_p.h b/src/plugins/multimedia/windows/evr/evrcustompresenter_p.h
index 1bf443efa..1bf443efa 100644
--- a/src/multimedia/platform/windows/evr/evrcustompresenter_p.h
+++ b/src/plugins/multimedia/windows/evr/evrcustompresenter_p.h
diff --git a/src/multimedia/platform/windows/evr/evrd3dpresentengine.cpp b/src/plugins/multimedia/windows/evr/evrd3dpresentengine.cpp
index 6090be6d6..6090be6d6 100644
--- a/src/multimedia/platform/windows/evr/evrd3dpresentengine.cpp
+++ b/src/plugins/multimedia/windows/evr/evrd3dpresentengine.cpp
diff --git a/src/multimedia/platform/windows/evr/evrd3dpresentengine_p.h b/src/plugins/multimedia/windows/evr/evrd3dpresentengine_p.h
index 0f031fa04..38f32bc52 100644
--- a/src/multimedia/platform/windows/evr/evrd3dpresentengine_p.h
+++ b/src/plugins/multimedia/windows/evr/evrd3dpresentengine_p.h
@@ -53,7 +53,7 @@
 
 #include <QMutex>
 #include <QVideoFrameFormat>
-#include <private/qwindowsiupointer_p.h>
+#include <qwindowsiupointer_p.h>
 
 #include <d3d9.h>
 
diff --git a/src/multimedia/platform/windows/evr/evrhelpers.cpp b/src/plugins/multimedia/windows/evr/evrhelpers.cpp
index 53e68d619..53e68d619 100644
--- a/src/multimedia/platform/windows/evr/evrhelpers.cpp
+++ b/src/plugins/multimedia/windows/evr/evrhelpers.cpp
diff --git a/src/multimedia/platform/windows/evr/evrhelpers_p.h b/src/plugins/multimedia/windows/evr/evrhelpers_p.h
index d7d6fb298..d7d6fb298 100644
--- a/src/multimedia/platform/windows/evr/evrhelpers_p.h
+++ b/src/plugins/multimedia/windows/evr/evrhelpers_p.h
diff --git a/src/multimedia/platform/windows/evr/evrvideowindowcontrol.cpp b/src/plugins/multimedia/windows/evr/evrvideowindowcontrol.cpp
index 4ea9fd716..4ea9fd716 100644
--- a/src/multimedia/platform/windows/evr/evrvideowindowcontrol.cpp
+++ b/src/plugins/multimedia/windows/evr/evrvideowindowcontrol.cpp
diff --git a/src/multimedia/platform/windows/evr/evrvideowindowcontrol_p.h b/src/plugins/multimedia/windows/evr/evrvideowindowcontrol_p.h
index dc29e1af7..098f59497 100644
--- a/src/multimedia/platform/windows/evr/evrvideowindowcontrol_p.h
+++ b/src/plugins/multimedia/windows/evr/evrvideowindowcontrol_p.h
@@ -56,7 +56,7 @@
 #include <evr9.h>
 #include <evr.h>
 #include <private/qplatformvideosink_p.h>
-#include <private/qwindowsmfdefs_p.h>
+#include <qwindowsmfdefs_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/multimedia/platform/windows/mediacapture/qwindowscamera.cpp b/src/plugins/multimedia/windows/mediacapture/qwindowscamera.cpp
index 53e8650f7..53e8650f7 100644
--- a/src/multimedia/platform/windows/mediacapture/qwindowscamera.cpp
+++ b/src/plugins/multimedia/windows/mediacapture/qwindowscamera.cpp
diff --git a/src/multimedia/platform/windows/mediacapture/qwindowscamera_p.h b/src/plugins/multimedia/windows/mediacapture/qwindowscamera_p.h
index 379a2cba3..379a2cba3 100644
--- a/src/multimedia/platform/windows/mediacapture/qwindowscamera_p.h
+++ b/src/plugins/multimedia/windows/mediacapture/qwindowscamera_p.h
diff --git a/src/multimedia/platform/windows/mediacapture/qwindowsimagecapture.cpp b/src/plugins/multimedia/windows/mediacapture/qwindowsimagecapture.cpp
index c5f7ffa97..e2a1952db 100644
--- a/src/multimedia/platform/windows/mediacapture/qwindowsimagecapture.cpp
+++ b/src/plugins/multimedia/windows/mediacapture/qwindowsimagecapture.cpp
@@ -41,7 +41,7 @@
 
 #include "qwindowsmediadevicesession_p.h"
 #include "qwindowsmediacapture_p.h"
-#include "qmediastoragelocation_p.h"
+#include <private/qmediastoragelocation_p.h>
 
 #include <QtConcurrent/qtconcurrentrun.h>
 #include <QtGui/qimagewriter.h>
diff --git a/src/multimedia/platform/windows/mediacapture/qwindowsimagecapture_p.h b/src/plugins/multimedia/windows/mediacapture/qwindowsimagecapture_p.h
index 6c3bc8107..6c3bc8107 100644
--- a/src/multimedia/platform/windows/mediacapture/qwindowsimagecapture_p.h
+++ b/src/plugins/multimedia/windows/mediacapture/qwindowsimagecapture_p.h
diff --git a/src/multimedia/platform/windows/mediacapture/qwindowsmediacapture.cpp b/src/plugins/multimedia/windows/mediacapture/qwindowsmediacapture.cpp
index ffaf32a24..7f6a061c9 100644
--- a/src/multimedia/platform/windows/mediacapture/qwindowsmediacapture.cpp
+++ b/src/plugins/multimedia/windows/mediacapture/qwindowsmediacapture.cpp
@@ -45,8 +45,8 @@
 #include "qwindowsimagecapture_p.h"
 #include "qmediadevices.h"
 #include "qaudiodevice.h"
-#include "qplatformaudioinput_p.h"
-#include "qplatformaudiooutput_p.h"
+#include "private/qplatformaudioinput_p.h"
+#include "private/qplatformaudiooutput_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/multimedia/platform/windows/mediacapture/qwindowsmediacapture_p.h b/src/plugins/multimedia/windows/mediacapture/qwindowsmediacapture_p.h
index 30c3c1abd..30c3c1abd 100644
--- a/src/multimedia/platform/windows/mediacapture/qwindowsmediacapture_p.h
+++ b/src/plugins/multimedia/windows/mediacapture/qwindowsmediacapture_p.h
diff --git a/src/multimedia/platform/windows/mediacapture/qwindowsmediadevicereader.cpp b/src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicereader.cpp
index 16414cca5..08f5fdf45 100644
--- a/src/multimedia/platform/windows/mediacapture/qwindowsmediadevicereader.cpp
+++ b/src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicereader.cpp
@@ -44,8 +44,8 @@
 #include <qmediadevices.h>
 #include <qaudiodevice.h>
 #include <private/qmemoryvideobuffer_p.h>
-#include <private/qwindowsmfdefs_p.h>
-#include <private/qwindowsiupointer_p.h>
+#include <qwindowsmfdefs_p.h>
+#include <qwindowsiupointer_p.h>
 #include <QtCore/qdebug.h>
 
 #include <mmdeviceapi.h>
diff --git a/src/multimedia/platform/windows/mediacapture/qwindowsmediadevicereader_p.h b/src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicereader_p.h
index 0b78be843..0b78be843 100644
--- a/src/multimedia/platform/windows/mediacapture/qwindowsmediadevicereader_p.h
+++ b/src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicereader_p.h
diff --git a/src/multimedia/platform/windows/mediacapture/qwindowsmediadevicesession.cpp b/src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicesession.cpp
index 5a96da72c..5a96da72c 100644
--- a/src/multimedia/platform/windows/mediacapture/qwindowsmediadevicesession.cpp
+++ b/src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicesession.cpp
diff --git a/src/multimedia/platform/windows/mediacapture/qwindowsmediadevicesession_p.h b/src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicesession_p.h
index df6328a6d..ffa57d58c 100644
--- a/src/multimedia/platform/windows/mediacapture/qwindowsmediadevicesession_p.h
+++ b/src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicesession_p.h
@@ -55,7 +55,7 @@
 #include <qcamera.h>
 #include <qaudiodevice.h>
 #include <qwindowsmultimediautils_p.h>
-#include <qplatformmediarecorder_p.h>
+#include <private/qplatformmediarecorder_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder.cpp b/src/plugins/multimedia/windows/mediacapture/qwindowsmediaencoder.cpp
index 82cb407b6..b9cdf2daa 100644
--- a/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder.cpp
+++ b/src/plugins/multimedia/windows/mediacapture/qwindowsmediaencoder.cpp
@@ -41,12 +41,12 @@
 
 #include "qwindowsmediadevicesession_p.h"
 #include "qwindowsmediacapture_p.h"
-#include "qmediastoragelocation_p.h"
 #include "mfmetadata_p.h"
 #include <QtCore/QUrl>
 #include <QtCore/QMimeType>
 #include <Mferror.h>
 #include <shobjidl.h>
+#include <private/qmediastoragelocation_p.h>
 #include <private/qmediarecorder_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder_p.h b/src/plugins/multimedia/windows/mediacapture/qwindowsmediaencoder_p.h
index 9269e0748..9269e0748 100644
--- a/src/multimedia/platform/windows/mediacapture/qwindowsmediaencoder_p.h
+++ b/src/plugins/multimedia/windows/mediacapture/qwindowsmediaencoder_p.h
diff --git a/src/multimedia/platform/windows/mfstream.cpp b/src/plugins/multimedia/windows/mfstream.cpp
index c49971025..c49971025 100644
--- a/src/multimedia/platform/windows/mfstream.cpp
+++ b/src/plugins/multimedia/windows/mfstream.cpp
diff --git a/src/multimedia/platform/windows/mfstream_p.h b/src/plugins/multimedia/windows/mfstream_p.h
index 3c8d6b296..3c8d6b296 100644
--- a/src/multimedia/platform/windows/mfstream_p.h
+++ b/src/plugins/multimedia/windows/mfstream_p.h
diff --git a/src/multimedia/platform/windows/player/mfactivate.cpp b/src/plugins/multimedia/windows/player/mfactivate.cpp
index 05d9321be..05d9321be 100644
--- a/src/multimedia/platform/windows/player/mfactivate.cpp
+++ b/src/plugins/multimedia/windows/player/mfactivate.cpp
diff --git a/src/multimedia/platform/windows/player/mfactivate_p.h b/src/plugins/multimedia/windows/player/mfactivate_p.h
index d3d5cf212..d3d5cf212 100644
--- a/src/multimedia/platform/windows/player/mfactivate_p.h
+++ b/src/plugins/multimedia/windows/player/mfactivate_p.h
diff --git a/src/multimedia/platform/windows/player/mfevrvideowindowcontrol.cpp b/src/plugins/multimedia/windows/player/mfevrvideowindowcontrol.cpp
index 105424253..105424253 100644
--- a/src/multimedia/platform/windows/player/mfevrvideowindowcontrol.cpp
+++ b/src/plugins/multimedia/windows/player/mfevrvideowindowcontrol.cpp
diff --git a/src/multimedia/platform/windows/player/mfevrvideowindowcontrol_p.h b/src/plugins/multimedia/windows/player/mfevrvideowindowcontrol_p.h
index 2f9d867d6..d1855705c 100644
--- a/src/multimedia/platform/windows/player/mfevrvideowindowcontrol_p.h
+++ b/src/plugins/multimedia/windows/player/mfevrvideowindowcontrol_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include "private/evrvideowindowcontrol_p.h"
+#include "evrvideowindowcontrol_p.h"
 
 QT_USE_NAMESPACE
 
diff --git a/src/multimedia/platform/windows/player/mfplayercontrol.cpp b/src/plugins/multimedia/windows/player/mfplayercontrol.cpp
index 67a5caa7b..67a5caa7b 100644
--- a/src/multimedia/platform/windows/player/mfplayercontrol.cpp
+++ b/src/plugins/multimedia/windows/player/mfplayercontrol.cpp
diff --git a/src/multimedia/platform/windows/player/mfplayercontrol_p.h b/src/plugins/multimedia/windows/player/mfplayercontrol_p.h
index 8238fe7a6..68c24194b 100644
--- a/src/multimedia/platform/windows/player/mfplayercontrol_p.h
+++ b/src/plugins/multimedia/windows/player/mfplayercontrol_p.h
@@ -52,7 +52,7 @@
 //
 
 #include "QUrl.h"
-#include "qplatformmediaplayer_p.h"
+#include "private/qplatformmediaplayer_p.h"
 
 #include <QtCore/qcoreevent.h>
 
diff --git a/src/multimedia/platform/windows/player/mfplayersession.cpp b/src/plugins/multimedia/windows/player/mfplayersession.cpp
index 540c7c539..83cb5d7c6 100644
--- a/src/multimedia/platform/windows/player/mfplayersession.cpp
+++ b/src/plugins/multimedia/windows/player/mfplayersession.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "qplatformmediaplayer_p.h"
+#include "private/qplatformmediaplayer_p.h"
 
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qdatetime.h>
@@ -47,19 +47,19 @@
 #include <QtCore/qfile.h>
 #include <QtCore/qbuffer.h>
 
-#include "qplatformaudiooutput_p.h"
+#include "private/qplatformaudiooutput_p.h"
 #include "qaudiooutput.h"
 
 #include "mfplayercontrol_p.h"
 #include "mfevrvideowindowcontrol_p.h"
 #include "mfvideorenderercontrol_p.h"
-#include <private/mfmetadata_p.h>
-#include <private/qwindowsmfdefs_p.h>
+#include <mfmetadata_p.h>
+#include <qwindowsmfdefs_p.h>
 
 #include "mfplayersession_p.h"
 #include <mferror.h>
 #include <nserror.h>
-#include "private/sourceresolver_p.h"
+#include "sourceresolver_p.h"
 #include "samplegrabber_p.h"
 #include "mftvideo_p.h"
 #include <wmcodecdsp.h>
diff --git a/src/multimedia/platform/windows/player/mfplayersession_p.h b/src/plugins/multimedia/windows/player/mfplayersession_p.h
index 4748c291e..4748c291e 100644
--- a/src/multimedia/platform/windows/player/mfplayersession_p.h
+++ b/src/plugins/multimedia/windows/player/mfplayersession_p.h
diff --git a/src/multimedia/platform/windows/player/mftvideo.cpp b/src/plugins/multimedia/windows/player/mftvideo.cpp
index fcc8d17c5..5e879eecd 100644
--- a/src/multimedia/platform/windows/player/mftvideo.cpp
+++ b/src/plugins/multimedia/windows/player/mftvideo.cpp
@@ -39,7 +39,7 @@
 
 #include "mftvideo_p.h"
 #include <private/qmemoryvideobuffer_p.h>
-#include <private/qwindowsmultimediautils_p.h>
+#include <qwindowsmultimediautils_p.h>
 #include <mferror.h>
 #include <strmif.h>
 #include <uuids.h>
diff --git a/src/multimedia/platform/windows/player/mftvideo_p.h b/src/plugins/multimedia/windows/player/mftvideo_p.h
index 6c0c2e6e7..6c0c2e6e7 100644
--- a/src/multimedia/platform/windows/player/mftvideo_p.h
+++ b/src/plugins/multimedia/windows/player/mftvideo_p.h
diff --git a/src/multimedia/platform/windows/player/mfvideorenderercontrol.cpp b/src/plugins/multimedia/windows/player/mfvideorenderercontrol.cpp
index 0c028933c..66dfa0594 100644
--- a/src/multimedia/platform/windows/player/mfvideorenderercontrol.cpp
+++ b/src/plugins/multimedia/windows/player/mfvideorenderercontrol.cpp
@@ -44,16 +44,16 @@
 
 #include <private/qplatformvideosink_p.h>
 #include <private/qabstractvideobuffer_p.h>
-#include <private/qwindowsmfdefs_p.h>
+#include <qwindowsmfdefs_p.h>
 #include <qvideosink.h>
 #include <qvideoframeformat.h>
-#include <qtcore/qtimer.h>
-#include <qtcore/qmutex.h>
-#include <qtcore/qcoreevent.h>
-#include <qtcore/qcoreapplication.h>
-#include <qtcore/qthread.h>
+#include <qtimer.h>
+#include <qmutex.h>
+#include <qcoreevent.h>
+#include <qcoreapplication.h>
+#include <qthread.h>
 #include "guiddef.h"
-#include <qtcore/qdebug.h>
+#include <qdebug.h>
 
 //#define DEBUG_MEDIAFOUNDATION
 #define PAD_TO_DWORD(x)  (((x) + 3) & ~3)
diff --git a/src/multimedia/platform/windows/player/mfvideorenderercontrol_p.h b/src/plugins/multimedia/windows/player/mfvideorenderercontrol_p.h
index 9b48803d9..9b48803d9 100644
--- a/src/multimedia/platform/windows/player/mfvideorenderercontrol_p.h
+++ b/src/plugins/multimedia/windows/player/mfvideorenderercontrol_p.h
diff --git a/src/multimedia/platform/windows/player/samplegrabber.cpp b/src/plugins/multimedia/windows/player/samplegrabber.cpp
index 93bec4ad6..93bec4ad6 100644
--- a/src/multimedia/platform/windows/player/samplegrabber.cpp
+++ b/src/plugins/multimedia/windows/player/samplegrabber.cpp
diff --git a/src/multimedia/platform/windows/player/samplegrabber_p.h b/src/plugins/multimedia/windows/player/samplegrabber_p.h
index ad522ade8..ad522ade8 100644
--- a/src/multimedia/platform/windows/player/samplegrabber_p.h
+++ b/src/plugins/multimedia/windows/player/samplegrabber_p.h
diff --git a/src/multimedia/platform/windows/qwindowsformatinfo.cpp b/src/plugins/multimedia/windows/qwindowsformatinfo.cpp
index 13f87161e..84347083e 100644
--- a/src/multimedia/platform/windows/qwindowsformatinfo.cpp
+++ b/src/plugins/multimedia/windows/qwindowsformatinfo.cpp
@@ -41,8 +41,8 @@
 
 #include <mfapi.h>
 #include <mftransform.h>
-#include <private/qwindowsiupointer_p.h>
-#include <private/qwindowsmultimediautils_p.h>
+#include <qwindowsiupointer_p.h>
+#include <qwindowsmultimediautils_p.h>
 
 #include <QtCore/qlist.h>
 #include <QtCore/qset.h>
diff --git a/src/multimedia/platform/windows/qwindowsformatinfo_p.h b/src/plugins/multimedia/windows/qwindowsformatinfo_p.h
index eeca80a6e..eeca80a6e 100644
--- a/src/multimedia/platform/windows/qwindowsformatinfo_p.h
+++ b/src/plugins/multimedia/windows/qwindowsformatinfo_p.h
diff --git a/src/multimedia/platform/windows/qwindowsintegration.cpp b/src/plugins/multimedia/windows/qwindowsintegration.cpp
index e6192a02b..2607e15cb 100644
--- a/src/multimedia/platform/windows/qwindowsintegration.cpp
+++ b/src/plugins/multimedia/windows/qwindowsintegration.cpp
@@ -38,18 +38,37 @@
 ****************************************************************************/
 
 #include "qwindowsintegration_p.h"
-#include <private/qwindowsmediadevices_p.h>
-#include <private/qwindowsformatinfo_p.h>
-#include <private/qwindowsmediacapture_p.h>
-#include <private/qwindowsimagecapture_p.h>
-#include <private/qwindowscamera_p.h>
-#include <private/qwindowsmediaencoder_p.h>
-#include <private/mfplayercontrol_p.h>
-#include <private/mfaudiodecodercontrol_p.h>
-#include <private/mfevrvideowindowcontrol_p.h>
+#include <qwindowsmediadevices_p.h>
+#include <qwindowsformatinfo_p.h>
+#include <qwindowsmediacapture_p.h>
+#include <qwindowsimagecapture_p.h>
+#include <qwindowscamera_p.h>
+#include <qwindowsmediaencoder_p.h>
+#include <mfplayercontrol_p.h>
+#include <mfaudiodecodercontrol_p.h>
+#include <mfevrvideowindowcontrol_p.h>
+#include <private/qplatformmediaplugin_p.h>
 
 QT_BEGIN_NAMESPACE
 
+class QWindowsMediaPlugin : public QPlatformMediaPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID QPlatformMediaPlugin_iid FILE "windows.json")
+
+public:
+    QWindowsMediaPlugin()
+      : QPlatformMediaPlugin()
+    {}
+
+    QPlatformMediaIntegration* create(const QString &name) override
+    {
+        if (name == QLatin1String("windows"))
+            return new QWindowsMediaIntegration;
+        return nullptr;
+    }
+};
+
 static int g_refCount = 0;
 
 QWindowsMediaIntegration::QWindowsMediaIntegration()
@@ -124,3 +143,5 @@ QPlatformVideoSink *QWindowsMediaIntegration::createVideoSink(QVideoSink *sink)
 }
 
 QT_END_NAMESPACE
+
+#include "qwindowsintegration.moc"
diff --git a/src/multimedia/platform/windows/qwindowsintegration_p.h b/src/plugins/multimedia/windows/qwindowsintegration_p.h
index 2c3a5de2a..2c3a5de2a 100644
--- a/src/multimedia/platform/windows/qwindowsintegration_p.h
+++ b/src/plugins/multimedia/windows/qwindowsintegration_p.h
diff --git a/src/multimedia/platform/windows/qwindowsmediadevices.cpp b/src/plugins/multimedia/windows/qwindowsmediadevices.cpp
index 61a389ca0..4a8bd667c 100644
--- a/src/multimedia/platform/windows/qwindowsmediadevices.cpp
+++ b/src/plugins/multimedia/windows/qwindowsmediadevices.cpp
@@ -39,15 +39,15 @@
 
 #include "qwindowsmediadevices_p.h"
 #include "qmediadevices.h"
-#include "qcameradevice_p.h"
+#include "private/qcameradevice_p.h"
 #include "qvarlengtharray.h"
 
-#include "private/qwindowsaudiosource_p.h"
-#include "private/qwindowsaudiosink_p.h"
-#include "private/qwindowsaudiodevice_p.h"
-#include "private/qwindowsmultimediautils_p.h"
+#include "qwindowsaudiosource_p.h"
+#include "qwindowsaudiosink_p.h"
+#include "qwindowsaudiodevice_p.h"
+#include "qwindowsmultimediautils_p.h"
 
-#include <private/mftvideo_p.h>
+#include <mftvideo_p.h>
 
 #include <Dbt.h>
 #include <ks.h>
@@ -61,8 +61,8 @@
 #include <Mferror.h>
 #include <mmdeviceapi.h>
 #include <Functiondiscoverykeys_devpkey.h>
-#include <private/qwindowsaudioutils_p.h>
-#include <private/qwindowsmfdefs_p.h>
+#include <qwindowsaudioutils_p.h>
+#include <qwindowsmfdefs_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/multimedia/platform/windows/qwindowsmediadevices_p.h b/src/plugins/multimedia/windows/qwindowsmediadevices_p.h
index 0dc06a4ec..5547bd073 100644
--- a/src/multimedia/platform/windows/qwindowsmediadevices_p.h
+++ b/src/plugins/multimedia/windows/qwindowsmediadevices_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <private/qplatformmediadevices_p.h>
-#include <private/qwindowsiupointer_p.h>
+#include <qwindowsiupointer_p.h>
 #include <qset.h>
 #include <qaudio.h>
 #include <qaudiodevice.h>
diff --git a/src/multimedia/platform/windows/sourceresolver.cpp b/src/plugins/multimedia/windows/sourceresolver.cpp
index 93af15a74..93af15a74 100644
--- a/src/multimedia/platform/windows/sourceresolver.cpp
+++ b/src/plugins/multimedia/windows/sourceresolver.cpp
diff --git a/src/multimedia/platform/windows/sourceresolver_p.h b/src/plugins/multimedia/windows/sourceresolver_p.h
index 0aab4cc19..0aab4cc19 100644
--- a/src/multimedia/platform/windows/sourceresolver_p.h
+++ b/src/plugins/multimedia/windows/sourceresolver_p.h
diff --git a/src/plugins/multimedia/windows/windows.json b/src/plugins/multimedia/windows/windows.json
new file mode 100644
index 000000000..05032c1b7
--- /dev/null
+++ b/src/plugins/multimedia/windows/windows.json
@@ -0,0 +1,3 @@
+{
+    "Keys": [ "windows" ]
+}