Use QList instead of QVector

Task-number: QTBUG-84469
Change-Id: I1ceb2dffcc0437c2800869bdf7697c17e9f81266
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>

22 files changed, 74 insertions, 92 deletions

diff --git a/examples/speech/hello_speak/mainwindow.cpp b/examples/speech/hello_speak/mainwindow.cpp
index 13ca29d..a7ccfd4 100644
--- a/examples/speech/hello_speak/mainwindow.cpp
+++ b/examples/speech/hello_speak/mainwindow.cpp
@@ -126,7 +126,7 @@ void MainWindow::engineSelected(int index)
     disconnect(ui.language, &QComboBox::currentIndexChanged, this, &MainWindow::languageSelected);
     ui.language->clear();
     // Populate the languages combobox before connecting its signal.
-    const QVector<QLocale> locales = m_speech->availableLocales();
+    const QList<QLocale> locales = m_speech->availableLocales();
     QLocale current = m_speech->locale();
     for (const QLocale &locale : locales) {
         QString name(QString("%1 (%2)")
diff --git a/examples/speech/hello_speak/mainwindow.h b/examples/speech/hello_speak/mainwindow.h
index eef4057..da1b8f9 100644
--- a/examples/speech/hello_speak/mainwindow.h
+++ b/examples/speech/hello_speak/mainwindow.h
@@ -83,7 +83,7 @@ public slots:
 private:
     Ui::MainWindow ui;
     QTextToSpeech *m_speech;
-    QVector<QVoice> m_voices;
+    QList<QVoice> m_voices;
 };
 
 #endif
diff --git a/src/plugins/tts/android/src/qtexttospeech_android.cpp b/src/plugins/tts/android/src/qtexttospeech_android.cpp
index b4bb006..c79f864 100644
--- a/src/plugins/tts/android/src/qtexttospeech_android.cpp
+++ b/src/plugins/tts/android/src/qtexttospeech_android.cpp
@@ -248,11 +248,11 @@ bool QTextToSpeechEngineAndroid::setVolume(double volume)
     return m_speech.callMethod<jint>("setVolume", "(F)I", float(volume)) == 0;
 }
 
-QVector<QLocale> QTextToSpeechEngineAndroid::availableLocales() const
+QList<QLocale> QTextToSpeechEngineAndroid::availableLocales() const
 {
     auto locales = m_speech.callObjectMethod("getAvailableLocales", "()Ljava/util/List;");
     int count = locales.callMethod<jint>("size");
-    QVector<QLocale> result;
+    QList<QLocale> result;
     result.reserve(count);
     for (int i = 0; i < count; ++i) {
         auto locale = locales.callObjectMethod("get", "(I)Ljava/lang/Object;", i);
@@ -303,11 +303,11 @@ QVoice QTextToSpeechEngineAndroid::javaVoiceObjectToQVoice(QJNIObjectPrivate &ob
     return createVoice(voiceName, gender, QVoice::Other, voiceName);
 }
 
-QVector<QVoice> QTextToSpeechEngineAndroid::availableVoices() const
+QList<QVoice> QTextToSpeechEngineAndroid::availableVoices() const
 {
     auto voices = m_speech.callObjectMethod("getAvailableVoices", "()Ljava/util/List;");
     int count = voices.callMethod<jint>("size");
-    QVector<QVoice> result;
+    QList<QVoice> result;
     result.reserve(count);
     for (int i = 0; i < count; ++i) {
         auto voice = voices.callObjectMethod("get", "(I)Ljava/lang/Object;", i);
diff --git a/src/plugins/tts/android/src/qtexttospeech_android.h b/src/plugins/tts/android/src/qtexttospeech_android.h
index 94c59f5..4aebba8 100644
--- a/src/plugins/tts/android/src/qtexttospeech_android.h
+++ b/src/plugins/tts/android/src/qtexttospeech_android.h
@@ -41,9 +41,9 @@
 #include "qvoice.h"
 
 #include <QtCore/private/qjni_p.h>
-#include <QtCore/QString>
+#include <QtCore/QList>
 #include <QtCore/QLocale>
-#include <QtCore/QVector>
+#include <QtCore/QString>
 
 QT_BEGIN_NAMESPACE
 
@@ -56,8 +56,8 @@ public:
     virtual ~QTextToSpeechEngineAndroid();
 
     // Plug-in API:
-    QVector<QLocale> availableLocales() const override;
-    QVector<QVoice> availableVoices() const override;
+    QList<QLocale> availableLocales() const override;
+    QList<QVoice> availableVoices() const override;
     void say(const QString &text) override;
     void stop() override;
     void pause() override;
diff --git a/src/plugins/tts/common/qtexttospeechprocessor_p.h b/src/plugins/tts/common/qtexttospeechprocessor_p.h
index 67b850e..4f5a74a 100644
--- a/src/plugins/tts/common/qtexttospeechprocessor_p.h
+++ b/src/plugins/tts/common/qtexttospeechprocessor_p.h
@@ -78,7 +78,7 @@ public:
     double rate() const;
     double pitch() const;
     double volume() const;
-    virtual const QVector<VoiceInfo> &voices() const = 0;
+    virtual const QList<VoiceInfo> &voices() const = 0;
 
 protected:
     // These are re-implemented QThread methods.
diff --git a/src/plugins/tts/flite/qtexttospeech_flite.cpp b/src/plugins/tts/flite/qtexttospeech_flite.cpp
index fc69397..19aca52 100644
--- a/src/plugins/tts/flite/qtexttospeech_flite.cpp
+++ b/src/plugins/tts/flite/qtexttospeech_flite.cpp
@@ -51,14 +51,14 @@ QTextToSpeechEngineFlite::~QTextToSpeechEngineFlite()
 {
 }
 
-QVector<QLocale> QTextToSpeechEngineFlite::availableLocales() const
+QList<QLocale> QTextToSpeechEngineFlite::availableLocales() const
 {
     return m_locales;
 }
 
-QVector<QVoice> QTextToSpeechEngineFlite::availableVoices() const
+QList<QVoice> QTextToSpeechEngineFlite::availableVoices() const
 {
-    return m_voices.values(m_currentLocale.name()).toVector();
+    return m_voices.values(m_currentLocale.name());
 }
 
 void QTextToSpeechEngineFlite::say(const QString &text)
@@ -172,7 +172,7 @@ QTextToSpeech::State QTextToSpeechEngineFlite::state() const
 bool QTextToSpeechEngineFlite::init(QString *errorString)
 {
     int i = 0;
-    const QVector<QTextToSpeechProcessor::VoiceInfo> &voices = m_processor->voices();
+    const QList<QTextToSpeechProcessor::VoiceInfo> &voices = m_processor->voices();
     for (const QTextToSpeechProcessor::VoiceInfo &voiceInfo : voices) {
         QString name = voiceInfo.name;
         QLocale locale(voiceInfo.locale);
diff --git a/src/plugins/tts/flite/qtexttospeech_flite.h b/src/plugins/tts/flite/qtexttospeech_flite.h
index cab71d5..3b32bf3 100644
--- a/src/plugins/tts/flite/qtexttospeech_flite.h
+++ b/src/plugins/tts/flite/qtexttospeech_flite.h
@@ -42,8 +42,8 @@
 #include "qvoice.h"
 
 #include <QtCore/QString>
+#include <QtCore/QList>
 #include <QtCore/QLocale>
-#include <QtCore/QVector>
 #include <QtCore/QSharedPointer>
 
 #include <flite/flite.h>
@@ -59,8 +59,8 @@ public:
     ~QTextToSpeechEngineFlite() override;
 
     // Plug-in API:
-    QVector<QLocale> availableLocales() const override;
-    QVector<QVoice> availableVoices() const override;
+    QList<QLocale> availableLocales() const override;
+    QList<QVoice> availableVoices() const override;
     void say(const QString &text) override;
     void stop() override;
     void pause() override;
@@ -87,7 +87,7 @@ private:
     QTextToSpeech::State m_state;
     QSharedPointer<QTextToSpeechProcessorFlite> m_processor;
     QLocale m_currentLocale;
-    QVector<QLocale> m_locales;
+    QList<QLocale> m_locales;
     QVoice m_currentVoice;
     // Voices mapped by their locale name.
     QMultiMap<QString, QVoice> m_voices;
diff --git a/src/plugins/tts/flite/qtexttospeech_flite_processor.cpp b/src/plugins/tts/flite/qtexttospeech_flite_processor.cpp
index 198c09b..c8a50e9 100644
--- a/src/plugins/tts/flite/qtexttospeech_flite_processor.cpp
+++ b/src/plugins/tts/flite/qtexttospeech_flite_processor.cpp
@@ -88,7 +88,7 @@ QTextToSpeechProcessorFlite::~QTextToSpeechProcessorFlite()
     }
 }
 
-const QVector<QTextToSpeechProcessor::VoiceInfo> &QTextToSpeechProcessorFlite::voices() const
+const QList<QTextToSpeechProcessor::VoiceInfo> &QTextToSpeechProcessorFlite::voices() const
 {
     return m_voices;
 }
diff --git a/src/plugins/tts/flite/qtexttospeech_flite_processor.h b/src/plugins/tts/flite/qtexttospeech_flite_processor.h
index 0288cd9..c3ebacc 100644
--- a/src/plugins/tts/flite/qtexttospeech_flite_processor.h
+++ b/src/plugins/tts/flite/qtexttospeech_flite_processor.h
@@ -42,10 +42,10 @@
 #include "qtexttospeechengine.h"
 #include "qvoice.h"
 
-#include <QtCore/QString>
-#include <QtCore/QVector>
-#include <QtCore/QSharedPointer>
+#include <QtCore/QList>
 #include <QtCore/QMutex>
+#include <QtCore/QSharedPointer>
+#include <QtCore/QString>
 
 #include <flite/flite.h>
 
@@ -59,7 +59,7 @@ class QTextToSpeechProcessorFlite : public QTextToSpeechProcessor {
 public:
     static QSharedPointer<QTextToSpeechProcessorFlite> instance();
     ~QTextToSpeechProcessorFlite() override;
-    const QVector<VoiceInfo> &voices() const override;
+    const QList<VoiceInfo> &voices() const override;
 
 private:
     QTextToSpeechProcessorFlite();
@@ -85,8 +85,8 @@ private:
     static QWeakPointer<QTextToSpeechProcessorFlite> m_instance;
     static QMutex m_instanceLock;
     bool m_initialized;
-    QVector<VoiceInfo> m_voices;
-    QVector<FliteVoice> m_fliteVoices;
+    QList<VoiceInfo> m_voices;
+    QList<FliteVoice> m_fliteVoices;
     int m_currentVoice;
 };
 
diff --git a/src/plugins/tts/ios/qtexttospeech_ios.h b/src/plugins/tts/ios/qtexttospeech_ios.h
index 8791f94..c2d6b4f 100644
--- a/src/plugins/tts/ios/qtexttospeech_ios.h
+++ b/src/plugins/tts/ios/qtexttospeech_ios.h
@@ -37,7 +37,7 @@
 #ifndef QTEXTTOSPEECHENGINE_IOS_H
 #define QTEXTTOSPEECHENGINE_IOS_H
 
-#include <QtCore/qvector.h>
+#include <QtCore/qlist.h>
 #include <QtTextToSpeech/qtexttospeechengine.h>
 #include <QtTextToSpeech/qvoice.h>
 
@@ -54,8 +54,8 @@ public:
     QTextToSpeechEngineIos(const QVariantMap &parameters, QObject *parent);
     ~QTextToSpeechEngineIos();
 
-    QVector<QLocale> availableLocales() const override;
-    QVector<QVoice> availableVoices() const override;
+    QList<QLocale> availableLocales() const override;
+    QList<QVoice> availableVoices() const override;
     void say(const QString &text) override;
     void stop() override;
     void pause() override;
diff --git a/src/plugins/tts/osx/qtexttospeech_osx.h b/src/plugins/tts/osx/qtexttospeech_osx.h
index 1085075..904dee0 100644
--- a/src/plugins/tts/osx/qtexttospeech_osx.h
+++ b/src/plugins/tts/osx/qtexttospeech_osx.h
@@ -37,10 +37,10 @@
 #ifndef QTEXTTOSPEECHENGINE_OSX_H
 #define QTEXTTOSPEECHENGINE_OSX_H
 
+#include <QtCore/qlist.h>
+#include <QtCore/qlocale.h>
 #include <QtCore/qobject.h>
-#include <QtCore/qvector.h>
 #include <QtCore/qstring.h>
-#include <QtCore/qlocale.h>
 #include <QtTextToSpeech/qtexttospeechengine.h>
 #include <QtTextToSpeech/qvoice.h>
 
@@ -59,8 +59,8 @@ public:
     ~QTextToSpeechEngineOsx();
 
     // Plug-in API:
-    QVector<QLocale> availableLocales() const override;
-    QVector<QVoice> availableVoices() const override;
+    QList<QLocale> availableLocales() const override;
+    QList<QVoice> availableVoices() const override;
     void say(const QString &text) override;
     void stop() override;
     void pause() override;
@@ -90,7 +90,7 @@ private:
     QVoice voiceForNSVoice(NSString *voiceString) const;
     NSSpeechSynthesizer *speechSynthesizer;
     QT_MANGLE_NAMESPACE(StateDelegate) *stateDelegate;
-    QVector<QLocale> m_locales;
+    QList<QLocale> m_locales;
     QMultiMap<QString, QVoice> m_voices;
 };
 
diff --git a/src/plugins/tts/sapi/qtexttospeech_sapi.cpp b/src/plugins/tts/sapi/qtexttospeech_sapi.cpp
index e371247..7c1b060 100644
--- a/src/plugins/tts/sapi/qtexttospeech_sapi.cpp
+++ b/src/plugins/tts/sapi/qtexttospeech_sapi.cpp
@@ -315,7 +315,7 @@ void QTextToSpeechEngineSapi::updateVoices()
     cpEnum->Release();
 }
 
-QVector<QLocale> QTextToSpeechEngineSapi::availableLocales() const
+QList<QLocale> QTextToSpeechEngineSapi::availableLocales() const
 {
     return m_locales;
 }
@@ -343,9 +343,9 @@ QLocale QTextToSpeechEngineSapi::locale() const
     return lcidToLocale(vAttr["Language"]);
 }
 
-QVector<QVoice> QTextToSpeechEngineSapi::availableVoices() const
+QList<QVoice> QTextToSpeechEngineSapi::availableVoices() const
 {
-    return m_voices.values(locale().name()).toVector();
+    return m_voices.values(locale().name());
 }
 
 bool QTextToSpeechEngineSapi::setVoice(const QVoice &voice)
diff --git a/src/plugins/tts/sapi/qtexttospeech_sapi.h b/src/plugins/tts/sapi/qtexttospeech_sapi.h
index 5e52dad..790660b 100644
--- a/src/plugins/tts/sapi/qtexttospeech_sapi.h
+++ b/src/plugins/tts/sapi/qtexttospeech_sapi.h
@@ -40,10 +40,10 @@
 #include <QtCore/qt_windows.h>
 #include <sapi.h>
 
+#include <QtCore/qlist.h>
+#include <QtCore/qlocale.h>
 #include <QtCore/qobject.h>
-#include <QtCore/qvector.h>
 #include <QtCore/qstring.h>
-#include <QtCore/qlocale.h>
 #include <QtTextToSpeech/qtexttospeechengine.h>
 #include <QtTextToSpeech/qvoice.h>
 
@@ -58,8 +58,8 @@ public:
     ~QTextToSpeechEngineSapi();
 
     // Plug-in API:
-    QVector<QLocale> availableLocales() const override;
-    QVector<QVoice> availableVoices() const override;
+    QList<QLocale> availableLocales() const override;
+    QList<QVoice> availableVoices() const override;
     void say(const QString &text) override;
     void stop() override;
     void pause() override;
@@ -88,7 +88,7 @@ private:
     void updateVoices();
 
     QTextToSpeech::State m_state;
-    QVector<QLocale> m_locales;
+    QList<QLocale> m_locales;
     QVoice m_currentVoice;
     // Voices mapped by their locale name.
     QMultiMap<QString, QVoice> m_voices;
diff --git a/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.cpp b/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.cpp
index 6eb74b8..4e0fac6 100644
--- a/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.cpp
+++ b/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.cpp
@@ -260,7 +260,7 @@ bool QTextToSpeechEngineSpeechd::setLocale(const QLocale &locale)
         QVoice previousVoice = m_currentVoice;
         m_currentLocale = locale;
 
-        QVector<QVoice> voices = availableVoices();
+        QList<QVoice> voices = availableVoices();
         if (voices.size() > 0 && setVoice(voices.at(0)))
             return true;
 
@@ -350,14 +350,14 @@ void QTextToSpeechEngineSpeechd::updateVoices()
 #endif
 }
 
-QVector<QLocale> QTextToSpeechEngineSpeechd::availableLocales() const
+QList<QLocale> QTextToSpeechEngineSpeechd::availableLocales() const
 {
     return m_locales;
 }
 
-QVector<QVoice> QTextToSpeechEngineSpeechd::availableVoices() const
+QList<QVoice> QTextToSpeechEngineSpeechd::availableVoices() const
 {
-    return m_voices.values(m_currentLocale.name()).toVector();
+    return m_voices.values(m_currentLocale.name());
 }
 
 // We have no way of knowing our own client_id since speech-dispatcher seems to be incomplete
diff --git a/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.h b/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.h
index 18df3e4..3c8f829 100644
--- a/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.h
+++ b/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.h
@@ -40,10 +40,10 @@
 #include "qtexttospeechengine.h"
 #include "qvoice.h"
 
+#include <QtCore/qlist.h>
+#include <QtCore/qlocale.h>
 #include <QtCore/qobject.h>
-#include <QtCore/qvector.h>
 #include <QtCore/qstring.h>
-#include <QtCore/qlocale.h>
 #include <libspeechd.h>
 
 QT_BEGIN_NAMESPACE
@@ -57,8 +57,8 @@ public:
     ~QTextToSpeechEngineSpeechd();
 
     // Plug-in API:
-    QVector<QLocale> availableLocales() const override;
-    QVector<QVoice> availableVoices() const override;
+    QList<QLocale> availableLocales() const override;
+    QList<QVoice> availableVoices() const override;
     void say(const QString &text) override;
     void stop() override;
     void pause() override;
@@ -86,7 +86,7 @@ private:
     QTextToSpeech::State m_state;
     SPDConnection *speechDispatcher;
     QLocale m_currentLocale;
-    QVector<QLocale> m_locales;
+    QList<QLocale> m_locales;
     QVoice m_currentVoice;
     // Voices mapped by their locale name.
     QMultiMap<QString, QVoice> m_voices;
diff --git a/src/plugins/tts/winrt/qtexttospeech_winrt.cpp b/src/plugins/tts/winrt/qtexttospeech_winrt.cpp
index fe67fcc..930a6f5 100644
--- a/src/plugins/tts/winrt/qtexttospeech_winrt.cpp
+++ b/src/plugins/tts/winrt/qtexttospeech_winrt.cpp
@@ -77,9 +77,9 @@ public:
     QTimer timer;
     ComPtr<IXamlReaderStatics> xamlReader;
     ComPtr<ISpeechSynthesizer> synth;
-    QVector<QLocale> locales;
-    QVector<QVoice> voices;
-    QVector<ComPtr<IVoiceInformation>> infos;
+    QList<QLocale> locales;
+    QList<QVoice> voices;
+    QList<ComPtr<IVoiceInformation>> infos;
     EventRegistrationToken tok;
 
     ComPtr<IMediaElement> media;
@@ -106,13 +106,13 @@ QTextToSpeechEngineWinRT::~QTextToSpeechEngineWinRT()
 {
 }
 
-QVector<QLocale> QTextToSpeechEngineWinRT::availableLocales() const
+QList<QLocale> QTextToSpeechEngineWinRT::availableLocales() const
 {
     Q_D(const QTextToSpeechEngineWinRT);
     return d->locales;
 }
 
-QVector<QVoice> QTextToSpeechEngineWinRT::availableVoices() const
+QList<QVoice> QTextToSpeechEngineWinRT::availableVoices() const
 {
     Q_D(const QTextToSpeechEngineWinRT);
     return d->voices;
diff --git a/src/plugins/tts/winrt/qtexttospeech_winrt.h b/src/plugins/tts/winrt/qtexttospeech_winrt.h
index 8729deb..61693c5 100644
--- a/src/plugins/tts/winrt/qtexttospeech_winrt.h
+++ b/src/plugins/tts/winrt/qtexttospeech_winrt.h
@@ -40,11 +40,11 @@
 #include <QtTextToSpeech/qtexttospeechengine.h>
 #include <QtTextToSpeech/qvoice.h>
 
-#include <QtCore/QObject>
-#include <QtCore/QVector>
-#include <QtCore/QString>
+#include <QtCore/QList>
 #include <QtCore/QLocale>
+#include <QtCore/QObject>
 #include <QtCore/QScopedPointer>
+#include <QtCore/QString>
 #include <QtCore/qt_windows.h>
 #include <wrl.h>
 
@@ -70,8 +70,8 @@ public:
     QTextToSpeechEngineWinRT(const QVariantMap &parameters, QObject *parent);
     ~QTextToSpeechEngineWinRT();
 
-    QVector<QLocale> availableLocales() const override;
-    QVector<QVoice> availableVoices() const override;
+    QList<QLocale> availableLocales() const override;
+    QList<QVoice> availableVoices() const override;
     void say(const QString &text) override;
     void stop() override;
     void pause() override;
diff --git a/src/tts/qtexttospeech.cpp b/src/tts/qtexttospeech.cpp
index 2f394e1..7bda297 100644
--- a/src/tts/qtexttospeech.cpp
+++ b/src/tts/qtexttospeech.cpp
@@ -300,24 +300,6 @@ void QTextToSpeech::resume()
         d->m_engine->resume();
 }
 
-//QVector<QString> QTextToSpeech::availableVoiceTypes() const
-//{
-//    Q_D(const QTextToSpeech);
-//    return d->availableVoiceTypes();
-//}
-
-//void QTextToSpeech::setVoiceType(const QString& type)
-//{
-//    Q_D(QTextToSpeech);
-//    d->setVoiceType(type);
-//}
-//QString QTextToSpeech::currentVoiceType() const
-//{
-//    Q_D(const QTextToSpeech);
-//    return d->currentVoiceType();
-//}
-
-
 /*!
  \property QTextToSpeech::pitch
  This property holds the voice pitch, ranging from -1.0 to 1.0.
@@ -409,16 +391,16 @@ QLocale QTextToSpeech::locale() const
 }
 
 /*!
- Gets a vector of locales that are currently supported.
+ Gets a list of locales that are currently supported.
  \note On some platforms these can change, for example,
        when the backend changes synthesizers.
 */
-QVector<QLocale> QTextToSpeech::availableLocales() const
+QList<QLocale> QTextToSpeech::availableLocales() const
 {
     Q_D(const QTextToSpeech);
     if (d->m_engine)
         return d->m_engine->availableLocales();
-    return QVector<QLocale>();
+    return QList<QLocale>();
 }
 
 /*!
@@ -447,15 +429,15 @@ QVoice QTextToSpeech::voice() const
 }
 
 /*!
- Gets a vector of voices available for the current locale.
+ Gets a list of voices available for the current locale.
  \note if no locale has been set, the system locale is used.
 */
-QVector<QVoice> QTextToSpeech::availableVoices() const
+QList<QVoice> QTextToSpeech::availableVoices() const
 {
     Q_D(const QTextToSpeech);
     if (d->m_engine)
         return d->m_engine->availableVoices();
-    return QVector<QVoice>();
+    return QList<QVoice>();
 }
 
 QT_END_NAMESPACE
diff --git a/src/tts/qtexttospeech.h b/src/tts/qtexttospeech.h
index 4156396..d89367f 100644
--- a/src/tts/qtexttospeech.h
+++ b/src/tts/qtexttospeech.h
@@ -74,11 +74,11 @@ public:
     explicit QTextToSpeech(const QString &engine, QObject *parent = nullptr);
     State state() const;
 
-    QVector<QLocale> availableLocales() const;
+    QList<QLocale> availableLocales() const;
     QLocale locale() const;
 
     QVoice voice() const;
-    QVector<QVoice> availableVoices() const;
+    QList<QVoice> availableVoices() const;
 
     double rate() const;
     double pitch() const;
diff --git a/src/tts/qtexttospeechengine.cpp b/src/tts/qtexttospeechengine.cpp
index a107fc2..45876b3 100644
--- a/src/tts/qtexttospeechengine.cpp
+++ b/src/tts/qtexttospeechengine.cpp
@@ -50,12 +50,12 @@ QT_BEGIN_NAMESPACE
   its pure virtual methods.
 */
 
-/*! \fn QVector<QLocale> QTextToSpeechEngine::availableLocales() const
+/*! \fn QList<QLocale> QTextToSpeechEngine::availableLocales() const
 
   Implementation of \l QTextToSpeech::availableLocales().
 */
 
-/*! \fn QVector<QVoice> QTextToSpeechEngine::availableVoices() const
+/*! \fn QList<QVoice> QTextToSpeechEngine::availableVoices() const
 
   Implementation of \l QTextToSpeech::availableVoices().
 */
diff --git a/src/tts/qtexttospeechengine.h b/src/tts/qtexttospeechengine.h
index 0b5e71a..2c0dc56 100644
--- a/src/tts/qtexttospeechengine.h
+++ b/src/tts/qtexttospeechengine.h
@@ -53,8 +53,8 @@ public:
     explicit QTextToSpeechEngine(QObject *parent = nullptr);
     ~QTextToSpeechEngine();
 
-    virtual QVector<QLocale> availableLocales() const = 0;
-    virtual QVector<QVoice> availableVoices() const = 0;
+    virtual QList<QLocale> availableLocales() const = 0;
+    virtual QList<QVoice> availableVoices() const = 0;
 
     virtual void say(const QString &text) = 0;
     virtual void stop() = 0;
diff --git a/tests/auto/texttospeech/tst_qtexttospeech.cpp b/tests/auto/texttospeech/tst_qtexttospeech.cpp
index dce6d81..6c0dafd 100644
--- a/tests/auto/texttospeech/tst_qtexttospeech.cpp
+++ b/tests/auto/texttospeech/tst_qtexttospeech.cpp
@@ -130,7 +130,7 @@ void tst_QTextToSpeech::set_voice()
     QCOMPARE(tts.state(), QTextToSpeech::Ready);
 
     // Choose a voice
-    QVector<QVoice> voices = tts.availableVoices();
+    QList<QVoice> voices = tts.availableVoices();
     int vId = 0;
     QVERIFY(voices.length()); // have at least one voice
     if (voices.length() > 1) {