summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on 'dev' in qt/qtspeechHEADdevQt Submodule Update Bot6 hours1-3/+3
| | | | | Change-Id: Idd6d33d67090e239058f486a2a01ddf02d9fd385 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Correct license for module and plugin filesLucie Gérard13 hours48-48/+48
| | | | | | | | | | | | | | | | | According to QUIP-18 [1], all module and plugin files should be LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only or LicenseRef-Qt-Commercial OR GPL-3.0-only Also, LGPL and non LGPL should not be mixed in a given directory [1]: https://contribute.qt-project.org/quips/18 Pick-to: 6.7 Task-number: QTBUG-121787 Change-Id: I07f52c613b50293d4d84c5cbd08e06643b1439e0 Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* Add a licenseRule.json file for checking of SPDX license identifiersLucie Gérard13 hours1-0/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The license test in qtqa reads this file in order to check the validity of the license used. This file reproduce the QUIP-18 [1] rules, with some exceptions. Each entry in the file corresponds to a set of licensing rules. A set of licensing rules can depend on the file ending, registered in "file_pattern_ending". The last entry in the file has no "file_pattern_ending", it sets the rules for the files whose licensing does not depend on their ending. The license to be used depends on the location of the file within the Qt module repository. Let's call this "<true_location>". The "<true_location>" can also correspond to a file name, offering flexibility for exceptions to the rule. The "<true_location>" are registered in "location". For each "<true_location>" there is a "file type" entry and a "spdx" entry. The "spdx" entry gives the rule: the expected license tag(s) in SPDX format for the file ending (if applicable) and "<true_location>". The "file type" informs on the QUIP-18 type the tested file corresponds to. It is purely informational for the reader. The set of rules are tested in order of appearance in the json file. For this reason, a more constraining ending (like "special.txt") needs to appear in a "file_pattern_ending" located before the "file_pattern_ending" of a less constraining ending (like ".txt"). Also, a file ending cannot be present in two "file_pattern_ending". "file_pattern_ending" and "spdx" should list strings. "<true_location>" can be regular expressions. During the test the deeper "<true_location>" are checked first. The order is which they appear in the json file does not matter. To test this file, run QT_MODULE_TO_TEST=../qtspeech perl tests/prebuild/license/tst_licenses.pl [1]: https://contribute.qt-project.org/quips/18 Pick-to: 6.7 Task-number: QTBUG-121039 Change-Id: Id6c2c17ab5686a738b60e3396ef29fe93b0f835c Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot30 hours1-3/+3
| | | | | Change-Id: If378c05c23775b62ba89ad69aef8da4ba1276c8f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* SpeechD: replace unguarded qDebug statement with categorized loggingVolker Hilsheimer3 days2-4/+4
| | | | | | | | | | | Amends ea5c48e518789c3387ed9c9d21978eda122e9782, which implemented progress reporting for most plugins, but the speechd engine doesn't support it as the protocol doesn't provide the information. Pick-to: 6.7 Fixes: QTBUG-124868 Change-Id: I1879cda88dda2107ea62a6639f4d828e3557cccb Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
* Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot4 days1-3/+3
| | | | | Change-Id: Ideec3e94beb3b8bd66ded7b5a43e3d4ad4e6f26b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot8 days1-3/+3
| | | | | Change-Id: I929e7174394bba787429192ce21423f93d998b47 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2024-04-191-3/+3
| | | | | Change-Id: I16e2b889b71cb1677a3e9e649bc4d05965e82641 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2024-04-171-3/+3
| | | | | Change-Id: I01f9fb6f2a2774c54979d7449f3165213172bf9e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2024-04-051-3/+3
| | | | | Change-Id: I535b910d658818129899c675a071053342f8a308 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Correct license for examples filesLucie Gérard2024-04-044-4/+4
| | | | | | | | | | | | | | Example takes precedence over build system file type. According to QUIP-18 [1], all examples file should be LicenseRef-Qt-Commercial OR BSD-3-Clause [1]: https://contribute.qt-project.org/quips/18 Pick-to: 6.7 Task-number: QTBUG-121787 Change-Id: I2ee3cf7d121ba87a42252e4267727dfe708a237f Reviewed-by: Kai Köhne <kai.koehne@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Change license for test filesLucie Gérard2024-04-045-5/+5
| | | | | | | | | | | | | According to QUIP-18 [1], all test files should be LicenseRef-Qt-Commercial OR GPL-3.0-only [1]: https://contribute.qt-project.org/quips/18 Pick-to: 6.7 Task-number: QTBUG-121787 Change-Id: I5e82161c6391caa1d44e8f3baac93a95ab80bfdb Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2024-03-261-3/+3
| | | | | Change-Id: I5f3f87e6df13a196c574793c6aa558391eee0d10 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2024-03-181-3/+3
| | | | | Change-Id: I85bafacb828b0d6b4399927c40fd3026c0371cda Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2024-03-151-3/+3
| | | | | Change-Id: I8438430726c80f7a1abe69d4fa35e121949185d3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Use NO_GENERATE_CPP_EXPORTS explicitlyAlexey Edelev2024-03-142-0/+2
| | | | | | | | | | | Use NO_GENERATE_CPP_EXPORTS explicitly for modules that don't need the autogenerated exports header file. Task-number: QTBUG-90492 Change-Id: Ic5fef6f6656c64e23fba0abf768ef7816aac09ed Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jeremy Whiting <jpwhiting@kde.org> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2024-03-101-3/+3
| | | | | Change-Id: I698be6a68c10eaadab6dc8277631e14da3d7d7ac Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* hello_speak example: Don't disable engine combo boxAxel Spoerl2024-03-062-5/+3
| | | | | | | | | | | | | | | | | | | | | The example disabled the QComboBox for engine selection by default, and enabled it when the default engine reported QTextToSpeech::Ready or changed its state for the first time. If the default engine failed to initialize, the default state QTextToSpeech::Error would never change. The combobox remained disabled in that case. No other engine could be chosen. Keep the combo box enabled. This amends 92cb62d6a1aca5785724d1616463da35c2fb71fc. As a drive-by, adapt copyright headers. Pick-to: 6.7 6.6 6.5 Change-Id: I651c91e1c43b43a0495873eda8640eeb03db08b7 Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de> Reviewed-by: Jeremy Whiting <jpwhiting@kde.org>
* QTextToSpeech - flite: remove redundant Q_UNUSED()Axel Spoerl2024-03-061-2/+0
| | | | | | | | | | | The QTextToSpeechEngineFlite c'tor Q_UNUSED the parameters argument, despite of actually using it. Remove Q_UNUSED(parameters) Pick-to: 6.7 Change-Id: I24223a073aff071e70ed6543a1d7cb875d70b0c6 Reviewed-by: Santhosh Kumar <santhosh.kumar.selvaraj@qt.io>
* Fix the QTextToSpeechEngineAndroid plugin target nameAlexey Edelev2024-03-061-2/+3
| | | | | | | | | | | | Make sure that Qt plugin ends with the 'Plugin' suffix. Without the proper suffix the plugin will be skipped when loading the QtTextToSpeech module. The target name doesn't affect the rest naming. Pick-to: 6.5 6.6 6.7 Fixes: QTBUG-122900 Change-Id: I9e66bd9e33c84d076f4c7eaf392e5ebd56539bfc Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Enqueue new text if added while the engine is busyVolker Hilsheimer2024-03-052-5/+12
| | | | | | | | | | | | | | | | Calling enqueue() should be equivalent to say() when the engine is Ready, otherwise it should enqueue the text. The old implementation only enqueued the text when the engine was in Speaking state, overriding the current utterance when the engine was already synthesizing, or paused. Adjust test to enqueue the next text chunk as soon as the engine transitions away from the Ready state. Pick-to: 6.7 6.6 Fixes: QTBUG-122884 Change-Id: I19518a92d1ae73b01dc3de1d9ae6178f5f55b3ad Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
* Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2024-03-041-3/+3
| | | | | Change-Id: I705b57543eb50827e7546a413f62a209545549c7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix creation of locale in test_default_voice testVolker Hilsheimer2024-03-041-1/+1
| | | | | | | | | | | "en-UK" would be a (non-existent) Ukrainian regional version of English. After recent CLDR updates, this now fails, as it should, so fix it to use "en-GB" to compare with Bob's expected "Oxford English" dialect. Fixes: QTBUG-122950 Pick-to: 6.7 6.6 Change-Id: I5bc87d30b1f5f3f9804206c069be2ad5a7dc5d43 Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
* Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2024-02-271-3/+3
| | | | | Change-Id: If72e0d5c1f082f5dabe2b67206bf68a972f56dcd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2024-02-241-3/+3
| | | | | Change-Id: I489c68c94c12de488a071dd0c3f441c0676779b7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2024-02-191-3/+3
| | | | | Change-Id: I4450c9f2e9781f1d955408a52f6ccfc2440684c4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2024-02-111-3/+3
| | | | | Change-Id: I1fe6aa7f8d2526f63c4fb2911b2cfd9aa4d6b14a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2024-02-101-3/+3
| | | | | Change-Id: Ib792abc235ebcb1717cf6589cc2d631bf54c0cbf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2024-02-071-3/+3
| | | | | Change-Id: I0a4308ad3d8ddbeb15602c931eee9f18b2a686ef Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove extra semi-colonsTasuku Suzuki2024-02-061-1/+1
| | | | | Change-Id: Icb4f791daf9a8a2df51dfcec054c95e28c134070 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2024-01-271-2/+2
| | | | | Change-Id: I385fdfca410bc5d362f1cd2fb182c40d8304b092 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2024-01-251-2/+2
| | | | | Change-Id: I6d982d3f0417105c36c2cd0d58cc31f0e6b673a7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2024-01-231-3/+3
| | | | | Change-Id: I77d162c8d05c3970608a2fa943d8eea471bdefaa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Revert "Temporarily blacklist tst_QTextToSpeech on openSuSE"Axel Spoerl2024-01-221-7/+0
| | | | | | | | | This reverts commit 887f04a8ae406799b972f1c73b37b8e687a3e539. Reason for revert: Root cause fixed with b93bcc2c9c2880461a9aab8384c61f5ddcfa30d6 Change-Id: I86ef1bcba10e1373d21822f8377a248fdd169ca4 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Fix documentation typoFabio Falsini2024-01-211-1/+1
| | | | | | | | In the QML documentation the signal errorOccurred has been written errorOccured Pick-to: 6.7 6.6 6.5 Change-Id: Ibbca62d7d617aea482a20781afa4925bc79b52c3 Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
* Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2024-01-201-3/+3
| | | | | Change-Id: If35a6e7f1bc4e68cbba63b052ad641ee8efd46e1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2024-01-191-3/+3
| | | | | Change-Id: Iec01d8cf920ad3c492d28693067e2a23a701d780 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2024-01-181-3/+3
| | | | | Change-Id: I8e94771b6a8a9857f027259759902c11704805fa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2024-01-161-3/+3
| | | | | Change-Id: I3f7fbd0e16cdf0240a52f19cda8c074c0dfc5d61 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Temporarily blacklist tst_QTextToSpeech on openSuSEAxel Spoerl2024-01-091-0/+7
| | | | | | | | | | | | | | COIN VM for current openSuSE targets (Leap 15.5) is provisioned without dummy audio device. That makes all tests flaky and sayMultiple() fail. Temporarily blacklist the test class on openSuSE. Cherrypick this down to 6.5, because all versions are affected. Fixes: QTBUG-120655 Pick-to: 6.7 6.6 6.5 Change-Id: I975890fb454a09eab2039b959748e4ef78908150 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2024-01-081-1/+1
| | | | | Change-Id: Ic64244a11913566e10ef44f71795efdeb125802f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2024-01-061-3/+3
| | | | | Change-Id: I65d86d31073aad76ff1d69e33ecf62165f52b13c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2023-12-281-3/+3
| | | | | Change-Id: Ia31849e914e9519937a121e474e77d82523b8717 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2023-12-211-3/+3
| | | | | Change-Id: I81bf9ee8575dfa5a77f2d1730c48899ca053598a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2023-12-181-3/+3
| | | | | Change-Id: I8ff0709c4542890cf88d1211f8316fcd119cc98d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2023-12-151-3/+3
| | | | | Change-Id: Icf228f6f96319b05d40f7a7b3ef50749e6b4200d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2023-12-141-3/+3
| | | | | Change-Id: I0288e84a307fbc255bb7ebc64916fab536fd3b07 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.8.0Jani Heikkinen2023-12-141-1/+1
| | | | | Change-Id: Ieaf123f6fdc84eaca652d0eb41ad24eb35c21e36 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2023-12-081-3/+3
| | | | | Change-Id: I002dbb80bc04055b682558ce54bc3db6cf3962fa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtspeechQt Submodule Update Bot2023-12-051-3/+3
| | | | | Change-Id: I2ec588d9c7353c307a4ee40c6b94a44ae042ff56 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>