diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-23 03:01:26 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-23 03:01:26 +0200 |
| commit | c32d7c14710a78f8dcad72091ac994c75fedf4f4 (patch) | |
| tree | 65b56c24b7a705fc2fd716190afa9f244364a37f | |
| parent | 8a4a62eff7d621d9c1106bed9868b9e6e86ce0e7 (diff) | |
| parent | 7bc90ab3d8c59bab7503ccd54f123d777c6c7951 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Id6f0fd14c58bbeae5f0ad6dd276acbb4930dcb36
| -rw-r--r-- | examples/speech/hello_speak/doc/src/hellospeakex.qdoc | 2 | ||||
| -rw-r--r-- | src/doc/src/qtspeech.qdoc | 2 | ||||
| -rw-r--r-- | src/tts/qtexttospeech.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/speech/hello_speak/doc/src/hellospeakex.qdoc b/examples/speech/hello_speak/doc/src/hellospeakex.qdoc index ea3bc8b..233e31a 100644 --- a/examples/speech/hello_speak/doc/src/hellospeakex.qdoc +++ b/examples/speech/hello_speak/doc/src/hellospeakex.qdoc @@ -29,7 +29,7 @@ \example hello_speak \title Hello Speak Example - \brief The Hello Speak example reads out a small piece of text + \brief The Hello Speak example reads out a small piece of text. \e{Hello Speak} example demonstrates how QTextToSpeech can be used to read out text, as well as control the pitch, volume, and rate of the speech. diff --git a/src/doc/src/qtspeech.qdoc b/src/doc/src/qtspeech.qdoc index b36b05b..1a21166 100644 --- a/src/doc/src/qtspeech.qdoc +++ b/src/doc/src/qtspeech.qdoc @@ -28,6 +28,6 @@ /*! \module QtSpeech \title Qt Speech C++ Classes - \brief Provides C++ API to access text-to-speech engines + \brief Provides C++ API to access text-to-speech engines. \qtvariable texttospeech */ diff --git a/src/tts/qtexttospeech.cpp b/src/tts/qtexttospeech.cpp index 18ab56d..f6e0f1a 100644 --- a/src/tts/qtexttospeech.cpp +++ b/src/tts/qtexttospeech.cpp @@ -158,7 +158,7 @@ void QTextToSpeechPrivate::loadPluginMetadata(QHash<QString, QJsonObject> &list) /*! \class QTextToSpeech - \brief The QTextToSpeech class provides a convenient access to text-to-speech engines + \brief The QTextToSpeech class provides a convenient access to text-to-speech engines. \inmodule QtSpeech Use \l say() to start synthesizing text. |