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-04-05 21:32:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-speech (Old) and /work/SRC/openSUSE:Factory/.qt6-speech.new.19717 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-speech" Wed Apr 5 21:32:10 2023 rev:5 rq:1077345 version:6.5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-speech/qt6-speech.changes 2023-03-17 17:04:10.541653133 +0100 +++ /work/SRC/openSUSE:Factory/.qt6-speech.new.19717/qt6-speech.changes 2023-04-05 21:37:06.547066410 +0200 @@ -1,0 +2,6 @@ +Mon Apr 3 10:02:43 UTC 2023 - Christophe Marin <christo...@krop.fr> + +- Update to 6.5.0 + * https://www.qt.io/blog/qt-6.5-lts-released + +------------------------------------------------------------------- Old: ---- qtspeech-everywhere-src-6.4.3.tar.xz New: ---- qtspeech-everywhere-src-6.5.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-speech.spec ++++++ --- /var/tmp/diff_new_pack.y3rQKB/_old 2023-04-05 21:37:07.059069332 +0200 +++ /var/tmp/diff_new_pack.y3rQKB/_new 2023-04-05 21:37:07.067069378 +0200 @@ -1,7 +1,7 @@ # # spec file for package qt6-speech # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,8 +16,8 @@ # -%define real_version 6.4.3 -%define short_version 6.4 +%define real_version 6.5.0 +%define short_version 6.5 %define tar_name qtspeech-everywhere-src %define tar_suffix %{nil} # @@ -27,7 +27,7 @@ %endif # Name: qt6-speech%{?pkg_suffix} -Version: 6.4.3 +Version: 6.5.0 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) @@ -35,11 +35,11 @@ Source: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz BuildRequires: pkgconfig BuildRequires: qt6-core-private-devel -BuildRequires: cmake(Qt6Core) -BuildRequires: cmake(Qt6Gui) -BuildRequires: cmake(Qt6Qml) -BuildRequires: cmake(Qt6Multimedia) -BuildRequires: cmake(Qt6Widgets) +BuildRequires: cmake(Qt6Core) = %{real_version} +BuildRequires: cmake(Qt6Gui) = %{real_version} +BuildRequires: cmake(Qt6Qml) = %{real_version} +BuildRequires: cmake(Qt6Multimedia) = %{real_version} +BuildRequires: cmake(Qt6Widgets) = %{real_version} # flite is not in openSUSE Factory # BuildRequires: cmake(Qt6Multimedia) BuildRequires: pkgconfig(speech-dispatcher) ++++++ qtspeech-everywhere-src-6.4.3.tar.xz -> qtspeech-everywhere-src-6.5.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/.cmake.conf new/qtspeech-everywhere-src-6.5.0/.cmake.conf --- old/qtspeech-everywhere-src-6.4.3/.cmake.conf 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/.cmake.conf 2023-03-28 22:59:49.000000000 +0200 @@ -1 +1,2 @@ -set(QT_REPO_MODULE_VERSION "6.4.3") +set(QT_REPO_MODULE_VERSION "6.5.0") +set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/.tag new/qtspeech-everywhere-src-6.5.0/.tag --- old/qtspeech-everywhere-src-6.4.3/.tag 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/.tag 2023-03-28 22:59:49.000000000 +0200 @@ -1 +1 @@ -7b771b0bf7e103da9a45347452c0cdec1ab2301a +da317b9e1fcf1f0d120ca9c10037cb4a83286a28 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/CMakeLists.txt new/qtspeech-everywhere-src-6.5.0/CMakeLists.txt --- old/qtspeech-everywhere-src-6.4.3/CMakeLists.txt 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/CMakeLists.txt 2023-03-28 22:59:49.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from qtspeech.pro. cmake_minimum_required(VERSION 3.16) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/LICENSES/Qt-GPL-exception-1.0.txt new/qtspeech-everywhere-src-6.5.0/LICENSES/Qt-GPL-exception-1.0.txt --- old/qtspeech-everywhere-src-6.4.3/LICENSES/Qt-GPL-exception-1.0.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/LICENSES/Qt-GPL-exception-1.0.txt 2023-03-28 22:59:49.000000000 +0200 @@ -0,0 +1,22 @@ +The Qt Company GPL Exception 1.0 + +Exception 1: + +As a special exception you may create a larger work which contains the +output of this application and distribute that work under terms of your +choice, so long as the work is not otherwise derived from or based on +this application and so long as the work does not in itself generate +output that contains the output from this application in its original +or modified form. + +Exception 2: + +As a special exception, you have permission to combine this application +with Plugins licensed under the terms of your choice, to produce an +executable, and to copy and distribute the resulting executable under +the terms of your choice. However, the executable must be accompanied +by a prominent notice offering all users of the executable the entire +source code to this application, excluding the source code of the +independent modules, but including any changes you have made to this +application, under the terms of this license. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/cmake/FindFlite.cmake new/qtspeech-everywhere-src-6.5.0/cmake/FindFlite.cmake --- old/qtspeech-everywhere-src-6.4.3/cmake/FindFlite.cmake 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/cmake/FindFlite.cmake 2023-03-28 22:59:49.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # We can't create the same interface imported target multiple times, CMake will complain if we do # that. This can happen if the find_package call is done in multiple different subdirectories. if(TARGET Flite::Flite) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/cmake/FindSpeechDispatcher.cmake new/qtspeech-everywhere-src-6.5.0/cmake/FindSpeechDispatcher.cmake --- old/qtspeech-everywhere-src-6.4.3/cmake/FindSpeechDispatcher.cmake 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/cmake/FindSpeechDispatcher.cmake 2023-03-28 22:59:49.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # We can't create the same interface imported target multiple times, CMake will complain if we do # that. This can happen if the find_package call is done in multiple different subdirectories. if(TARGET SpeechDispatcher::SpeechDispatcher) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/configure.cmake new/qtspeech-everywhere-src-6.5.0/configure.cmake --- old/qtspeech-everywhere-src-6.4.3/configure.cmake 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/configure.cmake 2023-03-28 22:59:49.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + #### Inputs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/dependencies.yaml new/qtspeech-everywhere-src-6.5.0/dependencies.yaml --- old/qtspeech-everywhere-src-6.4.3/dependencies.yaml 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/dependencies.yaml 2023-03-28 22:59:49.000000000 +0200 @@ -1,10 +1,10 @@ dependencies: ../qtbase: - ref: 519d2d8f442409e86a0ee2fa16bd543342180861 + ref: aea92807be2567c4212b96ae67de7137075ba4ee required: true ../qtdeclarative: - ref: 7161b3a04d08aea891bd7c7e459437260d29c3f3 + ref: 3238e18d6b0dc45d2e765fb0b93da5cbf3f396ec required: false ../qtmultimedia: - ref: 85e4cd3f1012ea5fc4b7607e3423e5865c0fff4d + ref: c618713d0fc81b460df93ffcdd69d1136769a01b required: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/examples/CMakeLists.txt new/qtspeech-everywhere-src-6.5.0/examples/CMakeLists.txt --- old/qtspeech-everywhere-src-6.4.3/examples/CMakeLists.txt 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/examples/CMakeLists.txt 2023-03-28 22:59:49.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from examples.pro. qt_examples_build_begin() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/examples/speech/CMakeLists.txt new/qtspeech-everywhere-src-6.5.0/examples/speech/CMakeLists.txt --- old/qtspeech-everywhere-src-6.4.3/examples/speech/CMakeLists.txt 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/examples/speech/CMakeLists.txt 2023-03-28 22:59:49.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from speech.pro. if(TARGET Qt::Widgets) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/examples/speech/hello_speak/CMakeLists.txt new/qtspeech-everywhere-src-6.5.0/examples/speech/hello_speak/CMakeLists.txt --- old/qtspeech-everywhere-src-6.4.3/examples/speech/hello_speak/CMakeLists.txt 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/examples/speech/hello_speak/CMakeLists.txt 2023-03-28 22:59:49.000000000 +0200 @@ -1,38 +1,34 @@ -# Generated from hello_speak.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause cmake_minimum_required(VERSION 3.14) project(hello_speak LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) - if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/speech/hello_speak") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Widgets) -find_package(Qt6 COMPONENTS TextToSpeech) +find_package(Qt6 REQUIRED COMPONENTS Core Gui TextToSpeech Widgets) + +qt_standard_project_setup() qt_add_executable(hello_speak main.cpp mainwindow.cpp mainwindow.h mainwindow.ui ) + set_target_properties(hello_speak PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) -target_link_libraries(hello_speak PUBLIC - Qt::Core - Qt::Gui - Qt::TextToSpeech - Qt::Widgets + +target_link_libraries(hello_speak PRIVATE + Qt6::Core + Qt6::Gui + Qt6::TextToSpeech + Qt6::Widgets ) install(TARGETS hello_speak diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/examples/speech/hello_speak/doc/src/hellospeakex.qdoc new/qtspeech-everywhere-src-6.5.0/examples/speech/hello_speak/doc/src/hellospeakex.qdoc --- old/qtspeech-everywhere-src-6.4.3/examples/speech/hello_speak/doc/src/hellospeakex.qdoc 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/examples/speech/hello_speak/doc/src/hellospeakex.qdoc 2023-03-28 22:59:49.000000000 +0200 @@ -5,6 +5,7 @@ \example hello_speak \title Hello Speak Example \ingroup qttexttospeech_examples + \meta tags {widgets} \brief The Hello Speak example reads out user-provided text. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/examples/speech/hello_speak/mainwindow.cpp new/qtspeech-everywhere-src-6.5.0/examples/speech/hello_speak/mainwindow.cpp --- old/qtspeech-everywhere-src-6.4.3/examples/speech/hello_speak/mainwindow.cpp 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/examples/speech/hello_speak/mainwindow.cpp 2023-03-28 22:59:49.000000000 +0200 @@ -7,8 +7,7 @@ #include <QLoggingCategory> MainWindow::MainWindow(QWidget *parent) - : QMainWindow(parent), - m_speech(nullptr) + : QMainWindow(parent), m_speech(nullptr) { ui.setupUi(this); QLoggingCategory::setFilterRules(QStringLiteral("qt.speech.tts=true \n qt.speech.tts.*=true")); @@ -21,22 +20,12 @@ ui.engine->setCurrentIndex(0); engineSelected(0); - connect(ui.speakButton, &QPushButton::clicked, this, &MainWindow::speak); connect(ui.pitch, &QSlider::valueChanged, this, &MainWindow::setPitch); connect(ui.rate, &QSlider::valueChanged, this, &MainWindow::setRate); connect(ui.volume, &QSlider::valueChanged, this, &MainWindow::setVolume); connect(ui.engine, &QComboBox::currentIndexChanged, this, &MainWindow::engineSelected); } -void MainWindow::speak() -{ - m_speech->say(ui.plainTextEdit->toPlainText()); -} -void MainWindow::stop() -{ - m_speech->stop(); -} - void MainWindow::setRate(int rate) { m_speech->setRate(rate / 10.0); @@ -52,6 +41,7 @@ m_speech->setVolume(volume / 100.0); } +//! [stateChanged] void MainWindow::stateChanged(QTextToSpeech::State state) { if (state == QTextToSpeech::Speaking) { @@ -67,6 +57,7 @@ ui.resumeButton->setEnabled(state == QTextToSpeech::Paused); ui.stopButton->setEnabled(state == QTextToSpeech::Speaking || state == QTextToSpeech::Paused); } +//! [stateChanged] void MainWindow::engineSelected(int index) { @@ -93,9 +84,24 @@ setRate(ui.rate->value()); setPitch(ui.pitch->value()); setVolume(ui.volume->value()); - connect(ui.stopButton, &QPushButton::clicked, m_speech, [this]{ m_speech->stop(); }); - connect(ui.pauseButton, &QPushButton::clicked, m_speech, [this]{ m_speech->pause(); }); +//! [say] + connect(ui.speakButton, &QPushButton::clicked, m_speech, [this]{ + m_speech->say(ui.plainTextEdit->toPlainText()); + }); +//! [say] +//! [stop] + connect(ui.stopButton, &QPushButton::clicked, m_speech, [this]{ + m_speech->stop(); + }); +//! [stop] +//! [pause] + connect(ui.pauseButton, &QPushButton::clicked, m_speech, [this]{ + m_speech->pause(); + }); +//! [pause] +//! [resume] connect(ui.resumeButton, &QPushButton::clicked, m_speech, &QTextToSpeech::resume); +//! [resume] connect(m_speech, &QTextToSpeech::stateChanged, this, &MainWindow::stateChanged); connect(m_speech, &QTextToSpeech::localeChanged, this, &MainWindow::localeChanged); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/examples/speech/hello_speak/mainwindow.h new/qtspeech-everywhere-src-6.5.0/examples/speech/hello_speak/mainwindow.h --- old/qtspeech-everywhere-src-6.4.3/examples/speech/hello_speak/mainwindow.h 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/examples/speech/hello_speak/mainwindow.h 2023-03-28 22:59:49.000000000 +0200 @@ -19,9 +19,6 @@ MainWindow(QWidget *parent = 0); public slots: - void speak(); - void stop(); - void setRate(int); void setPitch(int); void setVolume(int volume); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/examples/speech/quickspeech/doc/src/quickspeech.qdoc new/qtspeech-everywhere-src-6.5.0/examples/speech/quickspeech/doc/src/quickspeech.qdoc --- old/qtspeech-everywhere-src-6.4.3/examples/speech/quickspeech/doc/src/quickspeech.qdoc 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/examples/speech/quickspeech/doc/src/quickspeech.qdoc 2023-03-28 22:59:49.000000000 +0200 @@ -6,6 +6,7 @@ \title Quick Speech Example \ingroup qttexttospeech_examples \brief The Quick Speech example reads out user-provided text. + \meta tags {quick} The \e{Quick Speech} example demonstrates how the \l[QML]{TextToSpeech} type can be used in a \l{Qt Quick} application to read out text, and to control the speech. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/examples/speech/quickspeech/main.qml new/qtspeech-everywhere-src-6.5.0/examples/speech/quickspeech/main.qml --- old/qtspeech-everywhere-src-6.4.3/examples/speech/quickspeech/main.qml 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/examples/speech/quickspeech/main.qml 2023-03-28 22:59:49.000000000 +0200 @@ -13,12 +13,15 @@ minimumWidth: inputForm.implicitWidth minimumHeight: inputForm.implicitHeight + footer.implicitHeight +//! [initialize] TextToSpeech { id: tts volume: volumeSlider.value pitch: pitchSlider.value rate: rateSlider.value +//! [initialize] +//! [stateChanged] onStateChanged: (state) => { switch (state) { case TextToSpeech.Ready: @@ -35,6 +38,7 @@ break } } +//! [stateChanged] } ColumnLayout { @@ -44,30 +48,39 @@ TextArea { id: input + wrapMode: TextEdit.WordWrap text: qsTr("Hello, world!") Layout.fillWidth: true Layout.minimumHeight: implicitHeight } +//! [say0] RowLayout { Button { text: qsTr("Speak") enabled: [TextToSpeech.Paused, TextToSpeech.Ready].includes(tts.state) onClicked: { +//! [say0] let voices = tts.availableVoices() tts.voice = voices[voicesComboBox.currentIndex] +//! [say1] tts.say(input.text) } } +//! [say1] +//! [pause] Button { text: qsTr("Pause") enabled: tts.state == TextToSpeech.Speaking onClicked: tts.pause() } +//! [pause] +//! [resume] Button { text: qsTr("Resume") enabled: tts.state == TextToSpeech.Paused onClicked: tts.resume() } +//! [resume] Button { text: qsTr("Stop") enabled: [TextToSpeech.Speaking, TextToSpeech.Paused].includes(tts.state) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/include/QtTextToSpeech/6.4.3/QtTextToSpeech/private/qtexttospeech_p.h new/qtspeech-everywhere-src-6.5.0/include/QtTextToSpeech/6.4.3/QtTextToSpeech/private/qtexttospeech_p.h --- old/qtspeech-everywhere-src-6.4.3/include/QtTextToSpeech/6.4.3/QtTextToSpeech/private/qtexttospeech_p.h 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/include/QtTextToSpeech/6.4.3/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.3/include/QtTextToSpeech/6.4.3/QtTextToSpeech/private/qtexttospeech_qmltypes_p.h new/qtspeech-everywhere-src-6.5.0/include/QtTextToSpeech/6.4.3/QtTextToSpeech/private/qtexttospeech_qmltypes_p.h --- old/qtspeech-everywhere-src-6.4.3/include/QtTextToSpeech/6.4.3/QtTextToSpeech/private/qtexttospeech_qmltypes_p.h 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/include/QtTextToSpeech/6.4.3/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.3/include/QtTextToSpeech/6.4.3/QtTextToSpeech/private/qvoice_p.h new/qtspeech-everywhere-src-6.5.0/include/QtTextToSpeech/6.4.3/QtTextToSpeech/private/qvoice_p.h --- old/qtspeech-everywhere-src-6.4.3/include/QtTextToSpeech/6.4.3/QtTextToSpeech/private/qvoice_p.h 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/include/QtTextToSpeech/6.4.3/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.3/include/QtTextToSpeech/QTextToSpeech new/qtspeech-everywhere-src-6.5.0/include/QtTextToSpeech/QTextToSpeech --- old/qtspeech-everywhere-src-6.4.3/include/QtTextToSpeech/QTextToSpeech 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/include/QtTextToSpeech/QTextToSpeech 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "qtexttospeech.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/include/QtTextToSpeech/QTextToSpeechEngine new/qtspeech-everywhere-src-6.5.0/include/QtTextToSpeech/QTextToSpeechEngine --- old/qtspeech-everywhere-src-6.4.3/include/QtTextToSpeech/QTextToSpeechEngine 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/include/QtTextToSpeech/QTextToSpeechEngine 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "qtexttospeechengine.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/include/QtTextToSpeech/QTextToSpeechPlugin new/qtspeech-everywhere-src-6.5.0/include/QtTextToSpeech/QTextToSpeechPlugin --- old/qtspeech-everywhere-src-6.4.3/include/QtTextToSpeech/QTextToSpeechPlugin 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/include/QtTextToSpeech/QTextToSpeechPlugin 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "qtexttospeechplugin.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/include/QtTextToSpeech/QVoice new/qtspeech-everywhere-src-6.5.0/include/QtTextToSpeech/QVoice --- old/qtspeech-everywhere-src-6.4.3/include/QtTextToSpeech/QVoice 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/include/QtTextToSpeech/QVoice 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "qvoice.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/include/QtTextToSpeech/QtTextToSpeech new/qtspeech-everywhere-src-6.5.0/include/QtTextToSpeech/QtTextToSpeech --- old/qtspeech-everywhere-src-6.4.3/include/QtTextToSpeech/QtTextToSpeech 2023-03-12 11:00:40.970245400 +0100 +++ new/qtspeech-everywhere-src-6.5.0/include/QtTextToSpeech/QtTextToSpeech 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -#ifndef QT_QTTEXTTOSPEECH_MODULE_H -#define QT_QTTEXTTOSPEECH_MODULE_H -#include <QtTextToSpeech/QtTextToSpeechDepends> -#include "qtexttospeech.h" -#include "qtexttospeechengine.h" -#include "qtexttospeechplugin.h" -#include "qvoice.h" -#include "qttexttospeechversion.h" -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/include/QtTextToSpeech/QtTextToSpeechVersion new/qtspeech-everywhere-src-6.5.0/include/QtTextToSpeech/QtTextToSpeechVersion --- old/qtspeech-everywhere-src-6.4.3/include/QtTextToSpeech/QtTextToSpeechVersion 2023-03-12 11:00:40.970245400 +0100 +++ new/qtspeech-everywhere-src-6.5.0/include/QtTextToSpeech/QtTextToSpeechVersion 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "qttexttospeechversion.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/include/QtTextToSpeech/headers.pri new/qtspeech-everywhere-src-6.5.0/include/QtTextToSpeech/headers.pri --- old/qtspeech-everywhere-src-6.4.3/include/QtTextToSpeech/headers.pri 2023-03-12 11:00:40.970245400 +0100 +++ new/qtspeech-everywhere-src-6.5.0/include/QtTextToSpeech/headers.pri 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -SYNCQT.HEADER_FILES = qtexttospeech.h qtexttospeech_global.h qtexttospeechengine.h qtexttospeechplugin.h qvoice.h -SYNCQT.GENERATED_HEADER_FILES = QTextToSpeech QTextToSpeechEngine QTextToSpeechPlugin QVoice qttexttospeechversion.h QtTextToSpeechVersion QtTextToSpeech -SYNCQT.PRIVATE_HEADER_FILES = qtexttospeech_p.h qtexttospeech_qmltypes_p.h qvoice_p.h -SYNCQT.QPA_HEADER_FILES = -SYNCQT.CLEAN_HEADER_FILES = qtexttospeech.h qtexttospeech_global.h qtexttospeechengine.h qtexttospeechplugin.h qvoice.h -SYNCQT.INJECTIONS = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/include/QtTextToSpeech/qtexttospeech.h new/qtspeech-everywhere-src-6.5.0/include/QtTextToSpeech/qtexttospeech.h --- old/qtspeech-everywhere-src-6.4.3/include/QtTextToSpeech/qtexttospeech.h 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/include/QtTextToSpeech/qtexttospeech.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../src/tts/qtexttospeech.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/include/QtTextToSpeech/qtexttospeech_global.h new/qtspeech-everywhere-src-6.5.0/include/QtTextToSpeech/qtexttospeech_global.h --- old/qtspeech-everywhere-src-6.4.3/include/QtTextToSpeech/qtexttospeech_global.h 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/include/QtTextToSpeech/qtexttospeech_global.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../src/tts/qtexttospeech_global.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/include/QtTextToSpeech/qtexttospeechengine.h new/qtspeech-everywhere-src-6.5.0/include/QtTextToSpeech/qtexttospeechengine.h --- old/qtspeech-everywhere-src-6.4.3/include/QtTextToSpeech/qtexttospeechengine.h 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/include/QtTextToSpeech/qtexttospeechengine.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../src/tts/qtexttospeechengine.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/include/QtTextToSpeech/qtexttospeechplugin.h new/qtspeech-everywhere-src-6.5.0/include/QtTextToSpeech/qtexttospeechplugin.h --- old/qtspeech-everywhere-src-6.4.3/include/QtTextToSpeech/qtexttospeechplugin.h 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/include/QtTextToSpeech/qtexttospeechplugin.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../src/tts/qtexttospeechplugin.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/include/QtTextToSpeech/qttexttospeechversion.h new/qtspeech-everywhere-src-6.5.0/include/QtTextToSpeech/qttexttospeechversion.h --- old/qtspeech-everywhere-src-6.4.3/include/QtTextToSpeech/qttexttospeechversion.h 2023-03-12 11:00:40.970245400 +0100 +++ new/qtspeech-everywhere-src-6.5.0/include/QtTextToSpeech/qttexttospeechversion.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -/* This file was generated by syncqt. */ -#ifndef QT_QTTEXTTOSPEECH_VERSION_H -#define QT_QTTEXTTOSPEECH_VERSION_H - -#define QTTEXTTOSPEECH_VERSION_STR "6.4.3" - -#define QTTEXTTOSPEECH_VERSION 0x060403 - -#endif // QT_QTTEXTTOSPEECH_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/include/QtTextToSpeech/qvoice.h new/qtspeech-everywhere-src-6.5.0/include/QtTextToSpeech/qvoice.h --- old/qtspeech-everywhere-src-6.4.3/include/QtTextToSpeech/qvoice.h 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/include/QtTextToSpeech/qvoice.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../src/tts/qvoice.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/src/plugins/CMakeLists.txt new/qtspeech-everywhere-src-6.5.0/src/plugins/CMakeLists.txt --- old/qtspeech-everywhere-src-6.4.3/src/plugins/CMakeLists.txt 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/src/plugins/CMakeLists.txt 2023-03-28 22:59:49.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from plugins.pro. if(TARGET Qt::TextToSpeech) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/src/plugins/tts/CMakeLists.txt new/qtspeech-everywhere-src-6.5.0/src/plugins/tts/CMakeLists.txt --- old/qtspeech-everywhere-src-6.4.3/src/plugins/tts/CMakeLists.txt 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/src/plugins/tts/CMakeLists.txt 2023-03-28 22:59:49.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + add_subdirectory(mock) if(QT_FEATURE_speechd AND UNIX) add_subdirectory(speechdispatcher) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/src/plugins/tts/android/jar/CMakeLists.txt new/qtspeech-everywhere-src-6.5.0/src/plugins/tts/android/jar/CMakeLists.txt --- old/qtspeech-everywhere-src-6.4.3/src/plugins/tts/android/jar/CMakeLists.txt 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/src/plugins/tts/android/jar/CMakeLists.txt 2023-03-28 22:59:49.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + qt_get_android_sdk_jar_for_api("android-21" android_sdk) set(java_sources @@ -10,7 +13,9 @@ OUTPUT_DIR "${QT_BUILD_DIR}/jar" ) +qt_path_join(destination ${INSTALL_DATADIR} "jar") + install_jar(QtAndroidTextToSpeech - DESTINATION jar + DESTINATION ${destination} COMPONENT Devel ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/src/plugins/tts/android/src/CMakeLists.txt new/qtspeech-everywhere-src-6.5.0/src/plugins/tts/android/src/CMakeLists.txt --- old/qtspeech-everywhere-src-6.4.3/src/plugins/tts/android/src/CMakeLists.txt 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/src/plugins/tts/android/src/CMakeLists.txt 2023-03-28 22:59:49.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + qt_internal_add_plugin(QTextToSpeechEngineAndroid OUTPUT_NAME qttexttospeech_android PLUGIN_TYPE texttospeech diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/src/plugins/tts/darwin/CMakeLists.txt new/qtspeech-everywhere-src-6.5.0/src/plugins/tts/darwin/CMakeLists.txt --- old/qtspeech-everywhere-src-6.4.3/src/plugins/tts/darwin/CMakeLists.txt 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/src/plugins/tts/darwin/CMakeLists.txt 2023-03-28 22:59:49.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + qt_internal_find_apple_system_framework(FWAVFoundation AVFoundation) qt_internal_add_plugin(QTextToSpeechDarwinPlugin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/src/plugins/tts/flite/CMakeLists.txt new/qtspeech-everywhere-src-6.5.0/src/plugins/tts/flite/CMakeLists.txt --- old/qtspeech-everywhere-src-6.4.3/src/plugins/tts/flite/CMakeLists.txt 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/src/plugins/tts/flite/CMakeLists.txt 2023-03-28 22:59:49.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS Multimedia) qt_internal_add_plugin(QTextToSpeechFlitePlugin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/src/plugins/tts/macos/CMakeLists.txt new/qtspeech-everywhere-src-6.5.0/src/plugins/tts/macos/CMakeLists.txt --- old/qtspeech-everywhere-src-6.4.3/src/plugins/tts/macos/CMakeLists.txt 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/src/plugins/tts/macos/CMakeLists.txt 2023-03-28 22:59:49.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + qt_internal_add_plugin(QTextToSpeechMacOSPlugin OUTPUT_NAME qtexttospeech_speech_macos PLUGIN_TYPE texttospeech diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/src/plugins/tts/mock/CMakeLists.txt new/qtspeech-everywhere-src-6.5.0/src/plugins/tts/mock/CMakeLists.txt --- old/qtspeech-everywhere-src-6.4.3/src/plugins/tts/mock/CMakeLists.txt 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/src/plugins/tts/mock/CMakeLists.txt 2023-03-28 22:59:49.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + qt_internal_add_plugin(QTextToSpeechMockPlugin OUTPUT_NAME qtexttospeech_mock PLUGIN_TYPE texttospeech diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/src/plugins/tts/sapi/CMakeLists.txt new/qtspeech-everywhere-src-6.5.0/src/plugins/tts/sapi/CMakeLists.txt --- old/qtspeech-everywhere-src-6.4.3/src/plugins/tts/sapi/CMakeLists.txt 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/src/plugins/tts/sapi/CMakeLists.txt 2023-03-28 22:59:49.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + qt_internal_add_plugin(QTextToSpeechSapiPlugin OUTPUT_NAME qtexttospeech_sapi PLUGIN_TYPE texttospeech diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/src/plugins/tts/sapi/qtexttospeech_sapi.cpp new/qtspeech-everywhere-src-6.5.0/src/plugins/tts/sapi/qtexttospeech_sapi.cpp --- old/qtspeech-everywhere-src-6.4.3/src/plugins/tts/sapi/qtexttospeech_sapi.cpp 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/src/plugins/tts/sapi/qtexttospeech_sapi.cpp 2023-03-28 22:59:49.000000000 +0200 @@ -15,6 +15,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + #ifndef SPERR_NO_MORE_ITEMS # define SPERR_NO_MORE_ITEMS MAKE_SAPI_ERROR(0x039) #endif @@ -90,7 +92,7 @@ if (m_state != QTextToSpeech::Ready) stop(QTextToSpeech::BoundaryHint::Default); - textString.prepend(QString::fromLatin1("<pitch absmiddle=\"%1\"/>").arg(m_pitch * 10)); + textString.prepend(u"<pitch absmiddle=\"%1\"/>"_s.arg(m_pitch * 10)); std::wstring wtext = textString.toStdWString(); HRESULT hr = m_voice->Speak(wtext.data(), SPF_ASYNC, NULL); @@ -267,13 +269,13 @@ const QMap<QString, QString> vAttr = voiceAttributes(cpVoiceToken); // Transform Windows LCID to QLocale - const QLocale vLocale = lcidToLocale(vAttr[u"Language"_qs]); + const QLocale vLocale = lcidToLocale(vAttr[u"Language"_s]); // Create voice - const QString name = vAttr[u"Name"_qs]; - const QVoice::Age age = vAttr[u"Age"_qs] == u"Adult"_qs ? QVoice::Adult : QVoice::Other; - const QVoice::Gender gender = vAttr[u"Gender"_qs] == u"Male"_qs ? QVoice::Male : - vAttr[u"Gender"_qs] == u"Female"_qs ? QVoice::Female : + const QString name = vAttr[u"Name"_s]; + const QVoice::Age age = vAttr[u"Age"_s] == u"Adult"_s ? QVoice::Adult : QVoice::Other; + const QVoice::Gender gender = vAttr[u"Gender"_s] == u"Male"_s ? QVoice::Male : + vAttr[u"Gender"_s] == u"Female"_s ? QVoice::Female : QVoice::Unknown; // Getting the ID of the voice to set the voice later const QVoice voice = createVoice(name, vLocale, gender, age, voiceId(cpVoiceToken)); @@ -315,7 +317,7 @@ // read attributes const QMap<QString, QString> vAttr = voiceAttributes(cpVoiceToken); cpVoiceToken->Release(); - return lcidToLocale(vAttr.value(u"Language"_qs)); + return lcidToLocale(vAttr.value(u"Language"_s)); } QList<QVoice> QTextToSpeechEngineSapi::availableVoices() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/src/plugins/tts/speechdispatcher/CMakeLists.txt new/qtspeech-everywhere-src-6.5.0/src/plugins/tts/speechdispatcher/CMakeLists.txt --- old/qtspeech-everywhere-src-6.4.3/src/plugins/tts/speechdispatcher/CMakeLists.txt 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/src/plugins/tts/speechdispatcher/CMakeLists.txt 2023-03-28 22:59:49.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + qt_internal_add_plugin(QTextToSpeechSpeechdPlugin OUTPUT_NAME qtexttospeech_speechd PLUGIN_TYPE texttospeech diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/src/plugins/tts/winrt/CMakeLists.txt new/qtspeech-everywhere-src-6.5.0/src/plugins/tts/winrt/CMakeLists.txt --- old/qtspeech-everywhere-src-6.4.3/src/plugins/tts/winrt/CMakeLists.txt 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/src/plugins/tts/winrt/CMakeLists.txt 2023-03-28 22:59:49.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + qt_internal_add_plugin(QTextToSpeechWinRTPlugin OUTPUT_NAME qtexttospeech_winrt PLUGIN_TYPE texttospeech diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/src/tts/CMakeLists.txt new/qtspeech-everywhere-src-6.5.0/src/tts/CMakeLists.txt --- old/qtspeech-everywhere-src-6.4.3/src/tts/CMakeLists.txt 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/src/tts/CMakeLists.txt 2023-03-28 22:59:49.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + qt_internal_add_module(TextToSpeech PLUGIN_TYPES texttospeech SOURCES @@ -35,7 +38,7 @@ jar/QtAndroidTextToSpeech.jar ) set_property(TARGET TextToSpeech APPEND PROPERTY QT_ANDROID_LIB_DEPENDENCIES - plugins/texttospeech/libplugins_texttospeech_qttexttospeech_android.so + ${INSTALL_PLUGINSDIR}/texttospeech/libplugins_texttospeech_qttexttospeech_android.so ) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/src/tts/configure.cmake new/qtspeech-everywhere-src-6.5.0/src/tts/configure.cmake --- old/qtspeech-everywhere-src-6.4.3/src/tts/configure.cmake 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/src/tts/configure.cmake 2023-03-28 22:59:49.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + #### Inputs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/src/tts/doc/src/qt6-changes.qdoc new/qtspeech-everywhere-src-6.5.0/src/tts/doc/src/qt6-changes.qdoc --- old/qtspeech-everywhere-src-6.4.3/src/tts/doc/src/qt6-changes.qdoc 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/src/tts/doc/src/qt6-changes.qdoc 2023-03-28 22:59:49.000000000 +0200 @@ -29,7 +29,7 @@ \section1 API changes The \l{Qt TextToSpeech} module has undergone some basic consolidation and - cleanup. There should be minimal porting effort to be able to switch to Qt6. + cleanup. There should be minimal porting effort to be able to switch to Qt 6. \section2 The QTextToSpeech class diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/src/tts/qt_cmdline.cmake new/qtspeech-everywhere-src-6.5.0/src/tts/qt_cmdline.cmake --- old/qtspeech-everywhere-src-6.4.3/src/tts/qt_cmdline.cmake 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/src/tts/qt_cmdline.cmake 2023-03-28 22:59:49.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + qt_commandline_option(flite TYPE boolean) qt_commandline_option(flite-alsa TYPE boolean NAME flite_alsa) qt_commandline_option(speechd TYPE boolean) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/src/tts/qtexttospeech.cpp new/qtspeech-everywhere-src-6.5.0/src/tts/qtexttospeech.cpp --- old/qtspeech-everywhere-src-6.4.3/src/tts/qtexttospeech.cpp 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/src/tts/qtexttospeech.cpp 2023-03-28 22:59:49.000000000 +0200 @@ -144,8 +144,15 @@ \brief The QTextToSpeech class provides a convenient access to text-to-speech engines. \inmodule QtTextToSpeech - Use \l say() to start synthesizing text, and \l stop(), \l pause(), and \l resume() - to control the reading of the text. + Use \l say() to start reading text to the default audio device, and + \l stop(), \l pause(), and \l resume() to control the reading of the text. + + \snippet hello_speak/mainwindow.cpp say + \snippet hello_speak/mainwindow.cpp stop + \snippet hello_speak/mainwindow.cpp pause + \snippet hello_speak/mainwindow.cpp resume + + To synthesize text into PCM data for further processing, use synthesize(). The list of voices the engine supports for the current language is returned by \l availableVoices(). Change the language using \l setLocale(), using one of the @@ -164,8 +171,20 @@ \inqmlmodule QtTextToSpeech \brief The TextToSpeech type provides access to text-to-speech engines. - Use \l say() to start synthesizing text, and \l stop(), \l pause(), and \l resume() - to control the reading of the text. + Use \l say() to start reading text to the default audio device, and + \l stop(), \l pause(), and \l resume() to control the reading of the text. + + \snippet quickspeech/main.qml initialize + \codeline + \dots + \codeline + \snippet quickspeech/main.qml say0 + \snippet quickspeech/main.qml say1 + \snippet quickspeech/main.qml pause + \snippet quickspeech/main.qml resume + \dots + + To synthesize text into PCM data for further processing, use synthesize(). The list of voices the engine supports for the current language is returned by \l availableVoices(). Change the language using the \l locale property, using one @@ -369,12 +388,16 @@ \brief This property holds the current state of the speech synthesizer. \sa QTextToSpeech::State say() stop() pause() + + \snippet quickspeech/main.qml stateChanged */ /*! \property QTextToSpeech::state \brief the current state of the speech synthesizer. + \snippet hello_speak/mainwindow.cpp stateChanged + Use \l say() to start synthesizing text with the current \l voice and \l locale. */ QTextToSpeech::State QTextToSpeech::state() const @@ -455,6 +478,9 @@ This function starts sythesizing the speech asynchronously, and reads the text to the default audio output device. + \snippet quickspeech/main.qml say0 + \snippet quickspeech/main.qml say1 + \note All in-progress readings are stopped before beginning to read the recently synthesized text. @@ -471,6 +497,8 @@ This function starts sythesizing the speech asynchronously, and reads the text to the default audio output device. + \snippet hello_speak/mainwindow.cpp say + \note All in-progress readings are stopped before beginning to read the recently synthesized text. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/tests/CMakeLists.txt new/qtspeech-everywhere-src-6.5.0/tests/CMakeLists.txt --- old/qtspeech-everywhere-src-6.4.3/tests/CMakeLists.txt 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/tests/CMakeLists.txt 2023-03-28 22:59:49.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + if(QT_BUILD_STANDALONE_TESTS) # Add qt_find_package calls for extra dependencies that need to be found when building # the standalone tests here. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/tests/auto/qtexttospeech/CMakeLists.txt new/qtspeech-everywhere-src-6.5.0/tests/auto/qtexttospeech/CMakeLists.txt --- old/qtspeech-everywhere-src-6.4.3/tests/auto/qtexttospeech/CMakeLists.txt 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/tests/auto/qtexttospeech/CMakeLists.txt 2023-03-28 22:59:49.000000000 +0200 @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + if(NOT TARGET Qt::Multimedia) message(WARNING "The test case requires Qt::Multimedia to verify the presence of audio devices") return() @@ -6,20 +9,20 @@ qt_internal_add_test(tst_qtexttospeech SOURCES tst_qtexttospeech.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::TextToSpeechPrivate Qt::Multimedia ) # on macOS we need to run a Cocoa event dispatcher qt_internal_extend_target(tst_qtexttospeech CONDITION MACOS - PUBLIC_LIBRARIES + LIBRARIES Qt::Gui ) # for a standalone test build we have to find_package SpeechDispatcher again find_package(SpeechDispatcher) qt_internal_extend_target(tst_qtexttospeech CONDITION QT_FEATURE_speechd - PUBLIC_LIBRARIES + LIBRARIES SpeechDispatcher::SpeechDispatcher ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtspeech-everywhere-src-6.4.3/tests/auto/qvoice/CMakeLists.txt new/qtspeech-everywhere-src-6.5.0/tests/auto/qvoice/CMakeLists.txt --- old/qtspeech-everywhere-src-6.4.3/tests/auto/qvoice/CMakeLists.txt 2023-03-12 05:16:00.000000000 +0100 +++ new/qtspeech-everywhere-src-6.5.0/tests/auto/qvoice/CMakeLists.txt 2023-03-28 22:59:49.000000000 +0200 @@ -1,6 +1,9 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + qt_internal_add_test(tst_qvoice SOURCES tst_qvoice.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::TextToSpeechPrivate )
