Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-speech for openSUSE:Factory checked in at 2023-01-11 14:34:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-speech (Old) and /work/SRC/openSUSE:Factory/.qt6-speech.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-speech" Wed Jan 11 14:34:12 2023 rev:3 rq:1057280 version:6.4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-speech/qt6-speech.changes 2022-11-21 15:29:30.144619913 +0100 +++ /work/SRC/openSUSE:Factory/.qt6-speech.new.32243/qt6-speech.changes 2023-01-11 14:35:16.993308496 +0100 @@ -1,0 +2,6 @@ +Fri Jan 6 16:46:52 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 6.4.2: + * https://www.qt.io/blog/qt-6.4.2-released + +------------------------------------------------------------------- Old: ---- qtspeech-everywhere-src-6.4.1.tar.xz New: ---- qtspeech-everywhere-src-6.4.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-speech.spec ++++++ --- /var/tmp/diff_new_pack.4RvDPT/_old 2023-01-11 14:35:17.401310803 +0100 +++ /var/tmp/diff_new_pack.4RvDPT/_new 2023-01-11 14:35:17.405310825 +0100 @@ -16,7 +16,7 @@ # -%define real_version 6.4.1 +%define real_version 6.4.2 %define short_version 6.4 %define tar_name qtspeech-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-speech%{?pkg_suffix} -Version: 6.4.1 +Version: 6.4.2 Release: 0 Summary: Qt 6 TextToSpeech Library and Plugin License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) ++++++ qtspeech-everywhere-src-6.4.1.tar.xz -> qtspeech-everywhere-src-6.4.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.1/.cmake.conf new/qtspeech-everywhere-src-6.4.2/.cmake.conf --- old/qtspeech-everywhere-src-6.4.1/.cmake.conf 2022-11-09 01:07:29.000000000 +0100 +++ new/qtspeech-everywhere-src-6.4.2/.cmake.conf 2022-12-12 21:13:43.000000000 +0100 @@ -1 +1 @@ -set(QT_REPO_MODULE_VERSION "6.4.1") +set(QT_REPO_MODULE_VERSION "6.4.2") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.1/.tag new/qtspeech-everywhere-src-6.4.2/.tag --- old/qtspeech-everywhere-src-6.4.1/.tag 2022-11-09 01:07:29.000000000 +0100 +++ new/qtspeech-everywhere-src-6.4.2/.tag 2022-12-12 21:13:43.000000000 +0100 @@ -1 +1 @@ -361ffd18077b4ac3cebc4ac1cb5496c2bb78563a +68c109eefe6836c8d5de58e562290bfdf8332e8e diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.1/CMakeLists.txt new/qtspeech-everywhere-src-6.4.2/CMakeLists.txt --- old/qtspeech-everywhere-src-6.4.1/CMakeLists.txt 2022-11-09 01:07:29.000000000 +0100 +++ new/qtspeech-everywhere-src-6.4.2/CMakeLists.txt 2022-12-12 21:13:43.000000000 +0100 @@ -11,6 +11,11 @@ ) find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) -find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Gui Widgets Test Multimedia Qml) +find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Gui Widgets Test Multimedia Qml QmlIntegration) + +if(NOT TARGET Qt::QmlIntegration) + message(NOTICE "Skipping the build as the condition \"TARGET Qt::QmlIntegration\" is not met.") + return() +endif() qt_build_repo() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.1/dependencies.yaml new/qtspeech-everywhere-src-6.4.2/dependencies.yaml --- old/qtspeech-everywhere-src-6.4.1/dependencies.yaml 2022-11-09 01:07:29.000000000 +0100 +++ new/qtspeech-everywhere-src-6.4.2/dependencies.yaml 2022-12-12 21:13:43.000000000 +0100 @@ -1,10 +1,10 @@ dependencies: ../qtbase: - ref: 905755304a474c942346774d930b92e3665c1bab + ref: e3e40c44d3f998a433a6a1080297c5f28e9a768f required: true ../qtdeclarative: - ref: a514640b2a38391fceaaac3ca01b390ad3d62f31 + ref: 1b58f30087eedf42f16572d8ae1d6a5b18f3d698 required: false ../qtmultimedia: - ref: 6e056e80f717df878c016c6778cc091419cef44d + ref: 8943fec3308c310437e99203a3b2c9aba8b6ff7f required: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.1/examples/speech/hello_speak/mainwindow.cpp new/qtspeech-everywhere-src-6.4.2/examples/speech/hello_speak/mainwindow.cpp --- old/qtspeech-everywhere-src-6.4.1/examples/speech/hello_speak/mainwindow.cpp 2022-11-09 01:07:29.000000000 +0100 +++ new/qtspeech-everywhere-src-6.4.2/examples/speech/hello_speak/mainwindow.cpp 2022-12-12 21:13:43.000000000 +0100 @@ -125,7 +125,7 @@ m_voices = m_speech->availableVoices(); QVoice currentVoice = m_speech->voice(); - for (const QVoice &voice : qAsConst(m_voices)) { + for (const QVoice &voice : std::as_const(m_voices)) { ui.voice->addItem(QString("%1 - %2 - %3").arg(voice.name()) .arg(QVoice::genderName(voice.gender())) .arg(QVoice::ageName(voice.age()))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.1/include/QtTextToSpeech/6.4.1/QtTextToSpeech/private/qtexttospeech_p.h new/qtspeech-everywhere-src-6.4.2/include/QtTextToSpeech/6.4.1/QtTextToSpeech/private/qtexttospeech_p.h --- old/qtspeech-everywhere-src-6.4.1/include/QtTextToSpeech/6.4.1/QtTextToSpeech/private/qtexttospeech_p.h 2022-11-09 01:07:29.000000000 +0100 +++ new/qtspeech-everywhere-src-6.4.2/include/QtTextToSpeech/6.4.1/QtTextToSpeech/private/qtexttospeech_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/tts/qtexttospeech_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.1/include/QtTextToSpeech/6.4.1/QtTextToSpeech/private/qtexttospeech_qmltypes_p.h new/qtspeech-everywhere-src-6.4.2/include/QtTextToSpeech/6.4.1/QtTextToSpeech/private/qtexttospeech_qmltypes_p.h --- old/qtspeech-everywhere-src-6.4.1/include/QtTextToSpeech/6.4.1/QtTextToSpeech/private/qtexttospeech_qmltypes_p.h 2022-11-09 01:07:29.000000000 +0100 +++ new/qtspeech-everywhere-src-6.4.2/include/QtTextToSpeech/6.4.1/QtTextToSpeech/private/qtexttospeech_qmltypes_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/tts/qtexttospeech_qmltypes_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.1/include/QtTextToSpeech/6.4.1/QtTextToSpeech/private/qvoice_p.h new/qtspeech-everywhere-src-6.4.2/include/QtTextToSpeech/6.4.1/QtTextToSpeech/private/qvoice_p.h --- old/qtspeech-everywhere-src-6.4.1/include/QtTextToSpeech/6.4.1/QtTextToSpeech/private/qvoice_p.h 2022-11-09 01:07:29.000000000 +0100 +++ new/qtspeech-everywhere-src-6.4.2/include/QtTextToSpeech/6.4.1/QtTextToSpeech/private/qvoice_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/tts/qvoice_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.1/include/QtTextToSpeech/6.4.2/QtTextToSpeech/private/qtexttospeech_p.h new/qtspeech-everywhere-src-6.4.2/include/QtTextToSpeech/6.4.2/QtTextToSpeech/private/qtexttospeech_p.h --- old/qtspeech-everywhere-src-6.4.1/include/QtTextToSpeech/6.4.2/QtTextToSpeech/private/qtexttospeech_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.4.2/include/QtTextToSpeech/6.4.2/QtTextToSpeech/private/qtexttospeech_p.h 2022-12-12 21:13:43.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/tts/qtexttospeech_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.1/include/QtTextToSpeech/6.4.2/QtTextToSpeech/private/qtexttospeech_qmltypes_p.h new/qtspeech-everywhere-src-6.4.2/include/QtTextToSpeech/6.4.2/QtTextToSpeech/private/qtexttospeech_qmltypes_p.h --- old/qtspeech-everywhere-src-6.4.1/include/QtTextToSpeech/6.4.2/QtTextToSpeech/private/qtexttospeech_qmltypes_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.4.2/include/QtTextToSpeech/6.4.2/QtTextToSpeech/private/qtexttospeech_qmltypes_p.h 2022-12-12 21:13:43.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/tts/qtexttospeech_qmltypes_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.1/include/QtTextToSpeech/6.4.2/QtTextToSpeech/private/qvoice_p.h new/qtspeech-everywhere-src-6.4.2/include/QtTextToSpeech/6.4.2/QtTextToSpeech/private/qvoice_p.h --- old/qtspeech-everywhere-src-6.4.1/include/QtTextToSpeech/6.4.2/QtTextToSpeech/private/qvoice_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.4.2/include/QtTextToSpeech/6.4.2/QtTextToSpeech/private/qvoice_p.h 2022-12-12 21:13:43.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/tts/qvoice_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.1/include/QtTextToSpeech/qttexttospeechversion.h new/qtspeech-everywhere-src-6.4.2/include/QtTextToSpeech/qttexttospeechversion.h --- old/qtspeech-everywhere-src-6.4.1/include/QtTextToSpeech/qttexttospeechversion.h 2022-11-10 12:06:05.000000000 +0100 +++ new/qtspeech-everywhere-src-6.4.2/include/QtTextToSpeech/qttexttospeechversion.h 2022-12-13 08:05:07.000000000 +0100 @@ -2,8 +2,8 @@ #ifndef QT_QTTEXTTOSPEECH_VERSION_H #define QT_QTTEXTTOSPEECH_VERSION_H -#define QTTEXTTOSPEECH_VERSION_STR "6.4.1" +#define QTTEXTTOSPEECH_VERSION_STR "6.4.2" -#define QTTEXTTOSPEECH_VERSION 0x060401 +#define QTTEXTTOSPEECH_VERSION 0x060402 #endif // QT_QTTEXTTOSPEECH_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.1/src/plugins/tts/flite/qtexttospeech_flite_processor.cpp new/qtspeech-everywhere-src-6.4.2/src/plugins/tts/flite/qtexttospeech_flite_processor.cpp --- old/qtspeech-everywhere-src-6.4.1/src/plugins/tts/flite/qtexttospeech_flite_processor.cpp 2022-11-09 01:07:29.000000000 +0100 +++ new/qtspeech-everywhere-src-6.4.2/src/plugins/tts/flite/qtexttospeech_flite_processor.cpp 2022-12-12 21:13:43.000000000 +0100 @@ -23,7 +23,7 @@ QTextToSpeechProcessorFlite::~QTextToSpeechProcessorFlite() { - for (const VoiceInfo &voice : qAsConst(m_voices)) + for (const VoiceInfo &voice : std::as_const(m_voices)) voice.unregister_func(voice.vox); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.1/src/plugins/tts/mock/qtexttospeech_mock.cpp new/qtspeech-everywhere-src-6.4.2/src/plugins/tts/mock/qtexttospeech_mock.cpp --- old/qtspeech-everywhere-src-6.4.1/src/plugins/tts/mock/qtexttospeech_mock.cpp 2022-11-09 01:07:29.000000000 +0100 +++ new/qtspeech-everywhere-src-6.4.2/src/plugins/tts/mock/qtexttospeech_mock.cpp 2022-12-12 21:13:43.000000000 +0100 @@ -108,7 +108,7 @@ } Q_ASSERT(m_state == QTextToSpeech::Speaking); - Q_ASSERT(m_words.count()); + Q_ASSERT(m_words.size()); m_words.takeFirst(); // next word has been spoken diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.1/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.cpp new/qtspeech-everywhere-src-6.4.2/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.cpp --- old/qtspeech-everywhere-src-6.4.1/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.cpp 2022-11-09 01:07:29.000000000 +0100 +++ new/qtspeech-everywhere-src-6.4.2/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.cpp 2022-12-12 21:13:43.000000000 +0100 @@ -380,7 +380,7 @@ // (history functions are just stubs) void speech_finished_callback(size_t /*msg_id*/, size_t /*client_id*/, SPDNotificationType state) { - for (QTextToSpeechEngineSpeechd *backend : qAsConst(*backends)) + for (QTextToSpeechEngineSpeechd *backend : std::as_const(*backends)) backend->spdStateChanged(state); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.1/tests/auto/qtexttospeech/BLACKLIST new/qtspeech-everywhere-src-6.4.2/tests/auto/qtexttospeech/BLACKLIST --- old/qtspeech-everywhere-src-6.4.1/tests/auto/qtexttospeech/BLACKLIST 1970-01-01 01:00:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.4.2/tests/auto/qtexttospeech/BLACKLIST 2022-12-12 21:13:43.000000000 +0100 @@ -0,0 +1,2 @@ +[pauseResume:darwin] +macos-13 ci # QTBUG-108205 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.1/tests/auto/qtexttospeech/tst_qtexttospeech.cpp new/qtspeech-everywhere-src-6.4.2/tests/auto/qtexttospeech/tst_qtexttospeech.cpp --- old/qtspeech-everywhere-src-6.4.1/tests/auto/qtexttospeech/tst_qtexttospeech.cpp 2022-11-09 01:07:29.000000000 +0100 +++ new/qtspeech-everywhere-src-6.4.2/tests/auto/qtexttospeech/tst_qtexttospeech.cpp 2022-12-12 21:13:43.000000000 +0100 @@ -72,7 +72,7 @@ qInfo("Available text-to-speech engines:"); QTest::addColumn<QString>("engine"); const auto engines = QTextToSpeech::availableEngines(); - if (!engines.count()) + if (!engines.size()) QSKIP("No speech engines available, skipping test case"); for (const auto &engine : engines) { @@ -108,7 +108,7 @@ } else if (engine == "darwin" && QOperatingSystemVersion::current() <= QOperatingSystemVersion::MacOSMojave) { QTextToSpeech tts(engine); - if (!tts.availableLocales().count()) + if (!tts.availableLocales().size()) QSKIP("iOS engine is not functional on macOS <= 10.14"); } } @@ -120,7 +120,7 @@ QTRY_COMPARE(tts.state(), QTextToSpeech::Ready); qInfo("Available voices:"); const auto availableVoices = tts.availableVoices(); - QVERIFY(availableVoices.count() > 0); + QVERIFY(availableVoices.size() > 0); for (const auto &voice : availableVoices) qInfo().noquote() << "-" << voice; } @@ -131,7 +131,7 @@ QTextToSpeech tts(engine); QTRY_COMPARE(tts.state(), QTextToSpeech::Ready); const auto availableLocales = tts.availableLocales(); - QVERIFY(availableLocales.count() > 0); + QVERIFY(availableLocales.size() > 0); qInfo("Available locales:"); for (const auto &locale : availableLocales) qInfo().noquote() << "-" << locale; @@ -150,7 +150,7 @@ const auto availableLocales = tts.availableLocales(); // every engine must have a working default locale if it's Ready QVERIFY(availableLocales.contains(tts.locale())); - if (availableLocales.count() < 2) + if (availableLocales.size() < 2) QSKIP("Engine doesn't support more than one locale"); tts.setLocale(availableLocales[0]); @@ -164,17 +164,17 @@ // repeat, watch signal emissions tts.setLocale(availableLocales[1]); - QCOMPARE(localeSpy.count(), 1); + QCOMPARE(localeSpy.size(), 1); // a locale is only available if it has voices const auto voices1 = tts.availableVoices(); - QVERIFY(voices1.count()); + QVERIFY(voices1.size()); // If the voice is supported in the new locale, then it shouldn't change, // otherwise the voice should change as well. if (voices1.contains(voice0)) - QCOMPARE(voiceSpy.count(), 0); + QCOMPARE(voiceSpy.size(), 0); else - QCOMPARE(voiceSpy.count(), 1); + QCOMPARE(voiceSpy.size(), 1); } /* @@ -203,7 +203,7 @@ for (const auto &locale : tts.availableLocales()) { tts.setLocale(locale); const auto voices = tts.availableVoices(); - if (voices.count() > 1 && availableVoices.isEmpty()) { + if (voices.size() > 1 && availableVoices.isEmpty()) { availableVoices = voices; voicesLocale = locale; } @@ -212,11 +212,11 @@ otherLocale = locale; } // we found everything - if (availableVoices.count() > 1 && otherVoice != QVoice()) + if (availableVoices.size() > 1 && otherVoice != QVoice()) break; } // if we found neither, then we cannot test - if (availableVoices.count() < 2 && otherVoice == QVoice()) + if (availableVoices.size() < 2 && otherVoice == QVoice()) QSKIP("Engine %s supports only a single voice", qPrintable(engine)); tts.setVoice(defaultVoice); @@ -233,25 +233,25 @@ ++expectedVoiceChanged; ++expectedLocaleChanged; tts.setVoice(otherVoice); - QCOMPARE(voiceSpy.count(), expectedVoiceChanged); + QCOMPARE(voiceSpy.size(), expectedVoiceChanged); QCOMPARE(tts.locale(), otherLocale); - QCOMPARE(localeSpy.count(), expectedLocaleChanged); + QCOMPARE(localeSpy.size(), expectedLocaleChanged); } else { otherLocale = defaultLocale; } // two voices from the same locale - if (availableVoices.count() > 1) { + if (availableVoices.size() > 1) { if (tts.voice() != availableVoices[0]) ++expectedVoiceChanged; tts.setVoice(availableVoices[0]); - QCOMPARE(voiceSpy.count(), expectedVoiceChanged); + QCOMPARE(voiceSpy.size(), expectedVoiceChanged); if (voicesLocale != otherLocale) ++expectedLocaleChanged; - QCOMPARE(localeSpy.count(), expectedLocaleChanged); + QCOMPARE(localeSpy.size(), expectedLocaleChanged); tts.setVoice(availableVoices[1]); - QCOMPARE(voiceSpy.count(), ++expectedVoiceChanged); - QCOMPARE(localeSpy.count(), expectedLocaleChanged); + QCOMPARE(voiceSpy.size(), ++expectedVoiceChanged); + QCOMPARE(localeSpy.size(), expectedLocaleChanged); } } @@ -265,11 +265,11 @@ QCOMPARE(tts.rate(), 0.5); QSignalSpy spy(&tts, &QTextToSpeech::rateChanged); tts.setRate(0.0); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.value(0).first().toDouble(), 0.0); tts.setRate(tts.rate()); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); } void tst_QTextToSpeech::pitch() @@ -287,9 +287,9 @@ QString actual = QString("%1").arg(tts.pitch(), 0, 'g', 2); QString expected = QString("%1").arg(i / 10.0, 0, 'g', 2); QCOMPARE(actual, expected); - QCOMPARE(spy.count(), ++signalCount); + QCOMPARE(spy.size(), ++signalCount); tts.setPitch(tts.pitch()); - QCOMPARE(spy.count(), signalCount); + QCOMPARE(spy.size(), signalCount); } } @@ -302,14 +302,14 @@ QSignalSpy spy(&tts, &QTextToSpeech::volumeChanged); tts.setVolume(0.7); - QTRY_COMPARE(spy.count(), 1); + QTRY_COMPARE(spy.size(), 1); QVERIFY(spy.value(0).first().toDouble() > 0.6); QVERIFY2(tts.volume() > 0.65, QByteArray::number(tts.volume())); QVERIFY2(tts.volume() < 0.75, QByteArray::number(tts.volume())); tts.setVolume(tts.volume()); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); } @@ -374,10 +374,10 @@ selectWorkingVoice(&tts); const QList<QVoice> voices = tts.availableVoices(); - for (qsizetype i = 0; i < voices.count(); ++i) { + for (qsizetype i = 0; i < voices.size(); ++i) { if (i > 9) { - qWarning() << "sayWithVoices ended after 10 out of" << voices.count() << "voices."; + qWarning() << "sayWithVoices ended after 10 out of" << voices.size() << "voices."; break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.1/tests/auto/qvoice/tst_qvoice.cpp new/qtspeech-everywhere-src-6.4.2/tests/auto/qvoice/tst_qvoice.cpp --- old/qtspeech-everywhere-src-6.4.1/tests/auto/qvoice/tst_qvoice.cpp 2022-11-09 01:07:29.000000000 +0100 +++ new/qtspeech-everywhere-src-6.4.2/tests/auto/qvoice/tst_qvoice.cpp 2022-12-12 21:13:43.000000000 +0100 @@ -24,7 +24,7 @@ qInfo("Available text-to-speech engines:"); QTest::addColumn<QString>("engine"); const auto engines = QTextToSpeech::availableEngines(); - if (!engines.count()) + if (!engines.size()) QSKIP("No speech engines available, skipping test case"); for (const auto &engine : engines) { QTest::addRow("%s", engine.toUtf8().constData()) << engine; @@ -44,7 +44,7 @@ } else if (engine == "darwin" && QOperatingSystemVersion::current() <= QOperatingSystemVersion::MacOSMojave) { QTextToSpeech tts(engine); - if (!tts.availableLocales().count()) + if (!tts.availableLocales().size()) QSKIP("iOS engine is not functional on macOS <= 10.14"); } } @@ -58,7 +58,7 @@ QTextToSpeech tts(engine); QTRY_COMPARE(tts.state(), QTextToSpeech::Ready); const QList<QVoice> voices = tts.availableVoices(); - QVERIFY(voices.count()); + QVERIFY(voices.size()); QVoice emptyVoice; for (const auto &voice : voices) { @@ -88,7 +88,7 @@ QTRY_COMPARE(tts2.state(), QTextToSpeech::Ready); const QList<QVoice> voices = tts1.availableVoices(); - QVERIFY(voices.count()); + QVERIFY(voices.size()); QCOMPARE(tts1.availableVoices(), tts2.availableVoices()); for (const auto &voice : voices) @@ -105,7 +105,7 @@ QTextToSpeech tts(engine); QTRY_COMPARE(tts.state(), QTextToSpeech::Ready); const QList<QVoice> voices = tts.availableVoices(); - QVERIFY(voices.count()); + QVERIFY(voices.size()); savedVoice = voices.first(); QDataStream writeStream(&storage, QIODevice::WriteOnly);
