diff options
| author | André de la Rocha <andre.rocha@qt.io> | 2022-10-17 12:27:50 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-10-17 14:06:25 +0000 |
| commit | a804635796f7a6cca97314173cd65d7a482541df (patch) | |
| tree | 891c50fc3340f7bdb1a63ad39a4cf792b106e378 | |
| parent | ed5c122a9e144862bb728aca2babcd226738d3c0 (diff) | |
| download | qtmultimedia-a804635796f7a6cca97314173cd65d7a482541df.tar.gz | |
Fix Qt namespace usage for QWindowsMediaFoundation
The QWindowsMediaFoundation class was not being declared inside the
Qt namespace in some headers, causing symbol name mismatches.
Fixes: QTBUG-107701
Change-Id: I338b8a18f3fd0f9f6b5c2ba52b6b9cb0e9c36727
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 610f9c568f03aa39f50d0625ef07e81cbfcbdb15)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/multimedia/windows/qwindowsaudioutils_p.h | 3 | ||||
| -rw-r--r-- | src/multimedia/windows/qwindowsresampler_p.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/multimedia/windows/qwindowsaudioutils_p.h b/src/multimedia/windows/qwindowsaudioutils_p.h index fd618e77d..25f833d7c 100644 --- a/src/multimedia/windows/qwindowsaudioutils_p.h +++ b/src/multimedia/windows/qwindowsaudioutils_p.h @@ -23,10 +23,11 @@ #include <mmreg.h> struct IMFMediaType; -class QWindowsMediaFoundation; QT_BEGIN_NAMESPACE +class QWindowsMediaFoundation; + namespace QWindowsAudioUtils { bool formatToWaveFormatExtensible(const QAudioFormat &format, WAVEFORMATEXTENSIBLE &wfx); diff --git a/src/multimedia/windows/qwindowsresampler_p.h b/src/multimedia/windows/qwindowsresampler_p.h index 4667a4386..3b2e72d00 100644 --- a/src/multimedia/windows/qwindowsresampler_p.h +++ b/src/multimedia/windows/qwindowsresampler_p.h @@ -25,10 +25,11 @@ struct IMFSample; struct IMFTransform; -class QWindowsMediaFoundation; QT_BEGIN_NAMESPACE +class QWindowsMediaFoundation; + class Q_MULTIMEDIA_EXPORT QWindowsResampler { public: |