diff options
author | André de la Rocha <andre.rocha@qt.io> | 2021-09-15 07:24:14 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-17 09:59:46 +0000 |
commit | a761267d9f251e985d1d1185dc3b74466da56880 (patch) | |
tree | 074cb57241eb5b332a585ba75bfa95931d757ebb /src/multimedia/platform/windows/qwindowsintegration_p.h | |
parent | 3967a5c7c2de948a285581611d550338d43fdd95 (diff) |
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>
Diffstat (limited to 'src/multimedia/platform/windows/qwindowsintegration_p.h')
-rw-r--r-- | src/multimedia/platform/windows/qwindowsintegration_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
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(); |