diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2023-01-23 11:22:13 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-01-23 18:53:55 +0000 |
| commit | cf15cdf08020936000104985735d55af03ca595e (patch) | |
| tree | ead08b577c460f51425adebe5df2f93ad40e6e67 | |
| parent | badc7d6085043009f6d4b79b18d5b5c26c01484f (diff) | |
Proper clearing of WinRT factory cache in QtTextToSpeech
Use the factory-cache-cleaner registration developed in
qtbase/ffb9dee1b0954e4d4f9e9791175609a80ecafc31 to make QtTTS play its
part in fixing QTBUG-103611.
Including the qfactorycacheregistration_p.h header from another header
is explicitly supported (inline variable).
Remove from qtexttospeech_winrt_audiosource.cpp those includes already
included in qtexttospeech_winrt_audiosource.h.
QtTTS wasn't par of the Qt 6.2, so only picking back to 6.4.
Task-number: QTBUG-103611
Change-Id: Ic159853032e6ee915d62263c10af1e46dd55fc1c
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit fbbf6f35c5fd325d1b1774d6190532cc3fdf4407)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/plugins/tts/winrt/qtexttospeech_winrt.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/tts/winrt/qtexttospeech_winrt_audiosource.cpp | 9 | ||||
| -rw-r--r-- | src/plugins/tts/winrt/qtexttospeech_winrt_audiosource.h | 1 |
3 files changed, 2 insertions, 9 deletions
diff --git a/src/plugins/tts/winrt/qtexttospeech_winrt.cpp b/src/plugins/tts/winrt/qtexttospeech_winrt.cpp index eb51ace..b958073 100644 --- a/src/plugins/tts/winrt/qtexttospeech_winrt.cpp +++ b/src/plugins/tts/winrt/qtexttospeech_winrt.cpp @@ -12,6 +12,7 @@ #include <QtCore/private/qfunctions_winrt_p.h> #include <winrt/base.h> +#include <QtCore/private/qfactorycacheregistration_p.h> #include <windows.foundation.h> #include <windows.foundation.collections.h> #include <windows.media.speechsynthesis.h> diff --git a/src/plugins/tts/winrt/qtexttospeech_winrt_audiosource.cpp b/src/plugins/tts/winrt/qtexttospeech_winrt_audiosource.cpp index f782b1f..7635d0d 100644 --- a/src/plugins/tts/winrt/qtexttospeech_winrt_audiosource.cpp +++ b/src/plugins/tts/winrt/qtexttospeech_winrt_audiosource.cpp @@ -9,15 +9,6 @@ #include <QtCore/private/qfunctions_winrt_p.h> #include <QtCore/private/qsystemerror_p.h> -#include <robuffer.h> -#include <winrt/base.h> -#include <windows.foundation.h> -#include <windows.media.speechsynthesis.h> -#include <windows.storage.streams.h> - -#include <wrl.h> - - using namespace ABI::Windows::Foundation; using namespace ABI::Windows::Media::SpeechSynthesis; using namespace ABI::Windows::Storage::Streams; diff --git a/src/plugins/tts/winrt/qtexttospeech_winrt_audiosource.h b/src/plugins/tts/winrt/qtexttospeech_winrt_audiosource.h index 7990b13..dd74454 100644 --- a/src/plugins/tts/winrt/qtexttospeech_winrt_audiosource.h +++ b/src/plugins/tts/winrt/qtexttospeech_winrt_audiosource.h @@ -9,6 +9,7 @@ #include <robuffer.h> #include <winrt/base.h> +#include <QtCore/private/qfactorycacheregistration_p.h> #include <windows.foundation.h> #include <windows.media.speechsynthesis.h> #include <windows.storage.streams.h> |