Rename QWindowsIntegration to avoid collision with a qtbase symbol

The QWindowsIntegration name is used by a class in the Windows QPA in
qtbase, resulting in a symbol collision and linker error when doing a
static build. Renaming it to QWindowsMediaIntegration.

Fixes: QTBUG-96089
Change-Id: I786cce79fd8c618e93af71be64bc87ee18f8fbee
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>
(cherry picked from commit 4e1851251d45756ab4bd30b02af92d9b8911b37c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

3 files changed, 15 insertions, 15 deletions

diff --git a/src/multimedia/platform/qplatformmediaintegration.cpp b/src/multimedia/platform/qplatformmediaintegration.cpp
index 1ee62bafb..c3b4f1444 100644
--- a/src/multimedia/platform/qplatformmediaintegration.cpp
+++ b/src/multimedia/platform/qplatformmediaintegration.cpp
@@ -58,7 +58,7 @@ using PlatformIntegration = QAlsaIntegration;
 using PlatformIntegration = QDarwinIntegration;
 #elif QT_CONFIG(wmf)
 #include <private/qwindowsintegration_p.h>
-using PlatformIntegration = QWindowsIntegration;
+using PlatformIntegration = QWindowsMediaIntegration;
 #elif defined(Q_OS_ANDROID)
 #include <private/qandroidintegration_p.h>
 using PlatformIntegration = QAndroidIntegration;
diff --git a/src/multimedia/platform/windows/qwindowsintegration.cpp b/src/multimedia/platform/windows/qwindowsintegration.cpp
index 8f259beb7..b224a8937 100644
--- a/src/multimedia/platform/windows/qwindowsintegration.cpp
+++ b/src/multimedia/platform/windows/qwindowsintegration.cpp
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
 
 static int g_refCount = 0;
 
-QWindowsIntegration::QWindowsIntegration()
+QWindowsMediaIntegration::QWindowsMediaIntegration()
 {
     g_refCount++;
     if (g_refCount == 1) {
@@ -61,7 +61,7 @@ QWindowsIntegration::QWindowsIntegration()
     }
 }
 
-QWindowsIntegration::~QWindowsIntegration()
+QWindowsMediaIntegration::~QWindowsMediaIntegration()
 {
     delete m_devices;
     delete m_formatInfo;
@@ -74,51 +74,51 @@ QWindowsIntegration::~QWindowsIntegration()
     }
 }
 
-QPlatformMediaDevices *QWindowsIntegration::devices()
+QPlatformMediaDevices *QWindowsMediaIntegration::devices()
 {
     if (!m_devices)
         m_devices = new QWindowsMediaDevices();
     return m_devices;
 }
 
-QPlatformMediaFormatInfo *QWindowsIntegration::formatInfo()
+QPlatformMediaFormatInfo *QWindowsMediaIntegration::formatInfo()
 {
     if (!m_formatInfo)
         m_formatInfo = new QWindowsFormatInfo();
     return m_formatInfo;
 }
 
-QPlatformMediaCaptureSession *QWindowsIntegration::createCaptureSession()
+QPlatformMediaCaptureSession *QWindowsMediaIntegration::createCaptureSession()
 {
     return new QWindowsMediaCaptureService();
 }
 
-QPlatformAudioDecoder *QWindowsIntegration::createAudioDecoder(QAudioDecoder *decoder)
+QPlatformAudioDecoder *QWindowsMediaIntegration::createAudioDecoder(QAudioDecoder *decoder)
 {
     return new MFAudioDecoderControl(decoder);
 }
 
-QPlatformMediaPlayer *QWindowsIntegration::createPlayer(QMediaPlayer *parent)
+QPlatformMediaPlayer *QWindowsMediaIntegration::createPlayer(QMediaPlayer *parent)
 {
     return new MFPlayerControl(parent);
 }
 
-QPlatformCamera *QWindowsIntegration::createCamera(QCamera *camera)
+QPlatformCamera *QWindowsMediaIntegration::createCamera(QCamera *camera)
 {
     return new QWindowsCamera(camera);
 }
 
-QPlatformMediaEncoder *QWindowsIntegration::createEncoder(QMediaRecorder *encoder)
+QPlatformMediaEncoder *QWindowsMediaIntegration::createEncoder(QMediaRecorder *encoder)
 {
     return new QWindowsMediaEncoder(encoder);
 }
 
-QPlatformImageCapture *QWindowsIntegration::createImageCapture(QImageCapture *imageCapture)
+QPlatformImageCapture *QWindowsMediaIntegration::createImageCapture(QImageCapture *imageCapture)
 {
     return new QWindowsImageCapture(imageCapture);
 }
 
-QPlatformVideoSink *QWindowsIntegration::createVideoSink(QVideoSink *sink)
+QPlatformVideoSink *QWindowsMediaIntegration::createVideoSink(QVideoSink *sink)
 {
     return new MFEvrVideoWindowControl(sink);
 }
diff --git a/src/multimedia/platform/windows/qwindowsintegration_p.h b/src/multimedia/platform/windows/qwindowsintegration_p.h
index 44edf8900..835d502c1 100644
--- a/src/multimedia/platform/windows/qwindowsintegration_p.h
+++ b/src/multimedia/platform/windows/qwindowsintegration_p.h
@@ -58,11 +58,11 @@ QT_BEGIN_NAMESPACE
 class QWindowsMediaDevices;
 class QWindowsFormatInfo;
 
-class QWindowsIntegration : public QPlatformMediaIntegration
+class QWindowsMediaIntegration : public QPlatformMediaIntegration
 {
 public:
-    QWindowsIntegration();
-    ~QWindowsIntegration();
+    QWindowsMediaIntegration();
+    ~QWindowsMediaIntegration();
 
     void addRefCount();
     void releaseRefCount();