diff options
51 files changed, 164 insertions, 80 deletions
diff --git a/.cmake.conf b/.cmake.conf index 0a0ed55..307c6e6 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.8.0") +set(QT_REPO_MODULE_VERSION "6.9.0") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_CONTEXTLESS_CONNECT=1") diff --git a/dependencies.yaml b/dependencies.yaml index 059564d..0663bd6 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../qtbase: - ref: f0633e823796775d2c019363ca4f1cb008851402 + ref: 0ed039fd134fb8025236847295681f13f1775847 required: true ../qtdeclarative: - ref: 1635ca51f018bbb8d1ea5069a7f2ed8503be8cb9 + ref: 78d10d151fef7ee28be543dcebf460e791a954ff required: false ../qtmultimedia: - ref: 3873ceb52cfc6205ce56a218fd3f772dcb396b91 + ref: 272bdc0548c113c3f28f3f6a4143aafd99f2d417 required: true diff --git a/licenseRule.json b/licenseRule.json new file mode 100644 index 0000000..36f8125 --- /dev/null +++ b/licenseRule.json @@ -0,0 +1,84 @@ +[ + { + "comment" : ["file_pattern_ending: strings matched against the end of a file name.", + "location keys: regular expression matched against the beginning of", + "the file path (relative to the git submodule root).", + "spdx: list of SPDX-License-Expression's allowed in the matching files.", + "-------------------------------------------------------", + "Files with the following endings are Build System licensed,", + "unless they are examples", + "Files with other endings can also be build system files" + ], + "file_pattern_ending" : ["CMakeLists.txt", ".cmake", ".pro", ".pri", ".prf", + "configure", "configure.bat", "cmake.in", "plist.in", "CMakeLists.txt.in"], + "location" : { + "" : { + "comment" : "Default", + "file type" : "build system", + "spdx" : ["BSD-3-Clause"] + }, + "(.*)(examples/|snippets/)" : { + "comment" : "Example takes precedence", + "file type" : "examples and snippets", + "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] + } + } + }, + { + "comments" : ["Files with the following endings are Tool licensed,", + "unless they are examples.", + "Files with other endings can also be tool files."], + "file_pattern_ending" : [".sh", ".py", ".pl", ".bat", ".ps1"], + "location" :{ + "" : { + "comment" : "Default", + "file type" : "tools and utils", + "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"] + }, + "(.*)(examples/|snippets/)" : { + "comment" : "Example takes precedence", + "file type" : "examples and snippets", + "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] + } + } + }, + { + "comment" : "Files with the following endings are Documentation licensed.", + "file_pattern_ending" : [".qdoc", ".qdocinc" , ".qdocconf", ".txt", "README", "qt_attribution.json"], + "location" :{ + "" : { + "comment" : "", + "file type" : "documentation", + "spdx" : ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"] + } + } + }, + { + "comment" : ["All other files", + "The licensing is defined only by the file location in the Qt module repository.", + "NO <file_pattern_ending> key for this case!", + "This needs to be the last entry of the file."], + "location" : { + "" : { + "comment" : "Default", + "file type" : "module and plugin", + "spdx" : ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"] + }, + "src/" : { + "comment" : "Default", + "file type" : "module and plugin", + "spdx" : ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"] + }, + "tests/" : { + "comment" : "Default", + "file type" : "test", + "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"] + }, + "(.*)(examples/|snippets/)" : { + "comment" : "Default", + "file type" : "examples and snippets", + "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] + } + } + } +] diff --git a/src/plugins/tts/android/jar/src/org/qtproject/qt/android/speech/QtTextToSpeech.java b/src/plugins/tts/android/jar/src/org/qtproject/qt/android/speech/QtTextToSpeech.java index d14add6..84d755d 100644 --- a/src/plugins/tts/android/jar/src/org/qtproject/qt/android/speech/QtTextToSpeech.java +++ b/src/plugins/tts/android/jar/src/org/qtproject/qt/android/speech/QtTextToSpeech.java @@ -1,5 +1,5 @@ // Copyright (C) 2015 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only package org.qtproject.qt.android.speech; @@ -22,19 +22,19 @@ import java.util.List; import java.util.ArrayList; import java.util.Set; -public class QtTextToSpeech +class QtTextToSpeech { private static final String UTTERANCE_ID = "UtteranceId"; private static final String SYNTHESIZE_ID = "SynthesizeId"; // Native callback functions - native public void notifyError(long id, long reason); - native public void notifyReady(long id); - native public void notifySpeaking(long id); - native public void notifyRangeStart(long id, int start, int end, int frame); - native public void notifyBeginSynthesis(long id, int sampleRateInHz, int audioFormat, int channelCount); - native public void notifyAudioAvailable(long id, byte[] bytes); - native public void notifyEndSynthesis(long id); + native void notifyError(long id, long reason); + native void notifyReady(long id); + native void notifySpeaking(long id); + native void notifyRangeStart(long id, int start, int end, int frame); + native void notifyBeginSynthesis(long id, int sampleRateInHz, int audioFormat, int channelCount); + native void notifyAudioAvailable(long id, byte[] bytes); + native void notifyEndSynthesis(long id); private TextToSpeech mTts; private final long mId; @@ -163,7 +163,7 @@ public class QtTextToSpeech } } - public void say(String text) + void say(String text) { Log.d(TAG, "TTS say(): " + text); int result = -1; @@ -177,7 +177,7 @@ public class QtTextToSpeech notifyError(mId, 3); // QTextToSpeech::ErrorReason::Input } - public int synthesize(String text) + int synthesize(String text) { Log.d(TAG, "TTS synthesize(): " + text); int result = -1; @@ -193,18 +193,18 @@ public class QtTextToSpeech return -1; } - public void stop() + void stop() { Log.d(TAG, "Stopping TTS"); mTts.stop(); } - public float pitch() + float pitch() { return mPitch; } - public int setPitch(float pitch) + int setPitch(float pitch) { if (Float.compare(pitch, mPitch) == 0) return TextToSpeech.ERROR; @@ -218,12 +218,12 @@ public class QtTextToSpeech return success; } - public float rate() + float rate() { return mRate; } - public int setRate(float rate) + int setRate(float rate) { if (Float.compare(rate, mRate) == 0) return TextToSpeech.ERROR; @@ -237,17 +237,17 @@ public class QtTextToSpeech return success; } - public void shutdown() + void shutdown() { mTts.shutdown(); } - public float volume() + float volume() { return mVolume; } - public int setVolume(float volume) + int setVolume(float volume) { if (Float.compare(volume, mVolume) == 0) return TextToSpeech.ERROR; @@ -256,13 +256,13 @@ public class QtTextToSpeech return TextToSpeech.SUCCESS; } - public boolean setLocale(Locale locale) + boolean setLocale(Locale locale) { int result = mTts.setLanguage(locale); return (result != TextToSpeech.LANG_NOT_SUPPORTED) && (result != TextToSpeech.LANG_MISSING_DATA); } - public List<Object> getAvailableVoices() + List<Object> getAvailableVoices() { if (mInitialized && android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) { //Log.d(TAG, "Voices: " + mTts.getVoices()); @@ -271,7 +271,7 @@ public class QtTextToSpeech return new ArrayList<Object>(); } - public List<Locale> getAvailableLocales() + List<Locale> getAvailableLocales() { if (mInitialized && android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) { //Log.d(TAG, "Locales: " + mTts.getAvailableLanguages()); @@ -295,7 +295,7 @@ public class QtTextToSpeech return new ArrayList<Locale>(); } - public Locale getLocale() + Locale getLocale() { //Log.d(TAG, "getLocale: " + mLocale); final Locale language = mTts.getLanguage(); @@ -312,7 +312,7 @@ public class QtTextToSpeech return new Locale(languageCode, countryCode); } - public Object getVoice() + Object getVoice() { if (mInitialized && android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) { return mTts.getVoice(); @@ -320,7 +320,7 @@ public class QtTextToSpeech return null; } - public boolean setVoice(String voiceName) + boolean setVoice(String voiceName) { if (!mInitialized) return false; diff --git a/src/plugins/tts/android/src/qtexttospeech_android.cpp b/src/plugins/tts/android/src/qtexttospeech_android.cpp index 2b166c0..8515c9f 100644 --- a/src/plugins/tts/android/src/qtexttospeech_android.cpp +++ b/src/plugins/tts/android/src/qtexttospeech_android.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeech_android.h" #include <QtCore/qcoreapplication.h> diff --git a/src/plugins/tts/android/src/qtexttospeech_android.h b/src/plugins/tts/android/src/qtexttospeech_android.h index 47a7441..60e5220 100644 --- a/src/plugins/tts/android/src/qtexttospeech_android.h +++ b/src/plugins/tts/android/src/qtexttospeech_android.h @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHENGINE_ANDROID_H #define QTEXTTOSPEECHENGINE_ANDROID_H diff --git a/src/plugins/tts/android/src/qtexttospeech_android_plugin.cpp b/src/plugins/tts/android/src/qtexttospeech_android_plugin.cpp index 8cb2598..46a9d02 100644 --- a/src/plugins/tts/android/src/qtexttospeech_android_plugin.cpp +++ b/src/plugins/tts/android/src/qtexttospeech_android_plugin.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2015 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeech_android_plugin.h" #include "qtexttospeech_android.h" diff --git a/src/plugins/tts/android/src/qtexttospeech_android_plugin.h b/src/plugins/tts/android/src/qtexttospeech_android_plugin.h index 6af3e48..2191b32 100644 --- a/src/plugins/tts/android/src/qtexttospeech_android_plugin.h +++ b/src/plugins/tts/android/src/qtexttospeech_android_plugin.h @@ -1,5 +1,5 @@ // Copyright (C) 2015 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHPLUGIN_ANDROID_H #define QTEXTTOSPEECHPLUGIN_ANDROID_H diff --git a/src/plugins/tts/darwin/qtexttospeech_darwin.h b/src/plugins/tts/darwin/qtexttospeech_darwin.h index cb07732..078128c 100644 --- a/src/plugins/tts/darwin/qtexttospeech_darwin.h +++ b/src/plugins/tts/darwin/qtexttospeech_darwin.h @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHENGINE_DARWIN_H #define QTEXTTOSPEECHENGINE_DARWIN_H diff --git a/src/plugins/tts/darwin/qtexttospeech_darwin.mm b/src/plugins/tts/darwin/qtexttospeech_darwin.mm index 7161cf3..a8888c9 100644 --- a/src/plugins/tts/darwin/qtexttospeech_darwin.mm +++ b/src/plugins/tts/darwin/qtexttospeech_darwin.mm @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include <AVFoundation/AVFoundation.h> diff --git a/src/plugins/tts/darwin/qtexttospeech_darwin_plugin.cpp b/src/plugins/tts/darwin/qtexttospeech_darwin_plugin.cpp index f80e04c..f9ebf23 100644 --- a/src/plugins/tts/darwin/qtexttospeech_darwin_plugin.cpp +++ b/src/plugins/tts/darwin/qtexttospeech_darwin_plugin.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeech_darwin_plugin.h" #include "qtexttospeech_darwin.h" diff --git a/src/plugins/tts/darwin/qtexttospeech_darwin_plugin.h b/src/plugins/tts/darwin/qtexttospeech_darwin_plugin.h index 4f7d53c..fc605e0 100644 --- a/src/plugins/tts/darwin/qtexttospeech_darwin_plugin.h +++ b/src/plugins/tts/darwin/qtexttospeech_darwin_plugin.h @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHPLUGIN_DARWIN_H #define QTEXTTOSPEECHPLUGIN_DARWIN_H diff --git a/src/plugins/tts/flite/qtexttospeech_flite.cpp b/src/plugins/tts/flite/qtexttospeech_flite.cpp index 2146674..115b411 100644 --- a/src/plugins/tts/flite/qtexttospeech_flite.cpp +++ b/src/plugins/tts/flite/qtexttospeech_flite.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeech_flite.h" diff --git a/src/plugins/tts/flite/qtexttospeech_flite.h b/src/plugins/tts/flite/qtexttospeech_flite.h index 5e1c094..efec16f 100644 --- a/src/plugins/tts/flite/qtexttospeech_flite.h +++ b/src/plugins/tts/flite/qtexttospeech_flite.h @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHENGINE_FLITE_H #define QTEXTTOSPEECHENGINE_FLITE_H diff --git a/src/plugins/tts/flite/qtexttospeech_flite_plugin.cpp b/src/plugins/tts/flite/qtexttospeech_flite_plugin.cpp index 6d0b3c8..dd35f73 100644 --- a/src/plugins/tts/flite/qtexttospeech_flite_plugin.cpp +++ b/src/plugins/tts/flite/qtexttospeech_flite_plugin.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeech_flite_plugin.h" #include "qtexttospeech_flite.h" diff --git a/src/plugins/tts/flite/qtexttospeech_flite_plugin.h b/src/plugins/tts/flite/qtexttospeech_flite_plugin.h index 90927bd..a8bf7d6 100644 --- a/src/plugins/tts/flite/qtexttospeech_flite_plugin.h +++ b/src/plugins/tts/flite/qtexttospeech_flite_plugin.h @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHPLUGIN_FLITE_H #define QTEXTTOSPEECHPLUGIN_FLITE_H diff --git a/src/plugins/tts/flite/qtexttospeech_flite_processor.cpp b/src/plugins/tts/flite/qtexttospeech_flite_processor.cpp index 3769d4a..99c263e 100644 --- a/src/plugins/tts/flite/qtexttospeech_flite_processor.cpp +++ b/src/plugins/tts/flite/qtexttospeech_flite_processor.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeech_flite_processor.h" #include "qtexttospeech_flite_plugin.h" diff --git a/src/plugins/tts/flite/qtexttospeech_flite_processor.h b/src/plugins/tts/flite/qtexttospeech_flite_processor.h index 9a1a797..2a21148 100644 --- a/src/plugins/tts/flite/qtexttospeech_flite_processor.h +++ b/src/plugins/tts/flite/qtexttospeech_flite_processor.h @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHPROCESSOR_FLITE_H #define QTEXTTOSPEECHPROCESSOR_FLITE_H diff --git a/src/plugins/tts/macos/qtexttospeech_macos.h b/src/plugins/tts/macos/qtexttospeech_macos.h index 6b707c0..0f6ded6 100644 --- a/src/plugins/tts/macos/qtexttospeech_macos.h +++ b/src/plugins/tts/macos/qtexttospeech_macos.h @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHENGINE_MACOS_H #define QTEXTTOSPEECHENGINE_MACOS_H diff --git a/src/plugins/tts/macos/qtexttospeech_macos.mm b/src/plugins/tts/macos/qtexttospeech_macos.mm index db16065..1e09274 100644 --- a/src/plugins/tts/macos/qtexttospeech_macos.mm +++ b/src/plugins/tts/macos/qtexttospeech_macos.mm @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include <Cocoa/Cocoa.h> #include "qtexttospeech_macos.h" diff --git a/src/plugins/tts/macos/qtexttospeech_macos_plugin.cpp b/src/plugins/tts/macos/qtexttospeech_macos_plugin.cpp index 787f582..921095c 100644 --- a/src/plugins/tts/macos/qtexttospeech_macos_plugin.cpp +++ b/src/plugins/tts/macos/qtexttospeech_macos_plugin.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeech_macos_plugin.h" #include "qtexttospeech_macos.h" diff --git a/src/plugins/tts/macos/qtexttospeech_macos_plugin.h b/src/plugins/tts/macos/qtexttospeech_macos_plugin.h index 2be112d..9e61a59 100644 --- a/src/plugins/tts/macos/qtexttospeech_macos_plugin.h +++ b/src/plugins/tts/macos/qtexttospeech_macos_plugin.h @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHPLUGIN_MACOS_H #define QTEXTTOSPEECHPLUGIN_MACOS_H diff --git a/src/plugins/tts/mock/qtexttospeech_mock.cpp b/src/plugins/tts/mock/qtexttospeech_mock.cpp index 874dfe9..db0776d 100644 --- a/src/plugins/tts/mock/qtexttospeech_mock.cpp +++ b/src/plugins/tts/mock/qtexttospeech_mock.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeech_mock.h" diff --git a/src/plugins/tts/mock/qtexttospeech_mock.h b/src/plugins/tts/mock/qtexttospeech_mock.h index dece5f4..d3a6ed8 100644 --- a/src/plugins/tts/mock/qtexttospeech_mock.h +++ b/src/plugins/tts/mock/qtexttospeech_mock.h @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECH_MOCK_H #define QTEXTTOSPEECH_MOCK_H diff --git a/src/plugins/tts/mock/qtexttospeech_mock_plugin.cpp b/src/plugins/tts/mock/qtexttospeech_mock_plugin.cpp index cce471f..492097a 100644 --- a/src/plugins/tts/mock/qtexttospeech_mock_plugin.cpp +++ b/src/plugins/tts/mock/qtexttospeech_mock_plugin.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeech_mock_plugin.h" #include "qtexttospeech_mock.h" diff --git a/src/plugins/tts/mock/qtexttospeech_mock_plugin.h b/src/plugins/tts/mock/qtexttospeech_mock_plugin.h index 86d9d3f..b2760f9 100644 --- a/src/plugins/tts/mock/qtexttospeech_mock_plugin.h +++ b/src/plugins/tts/mock/qtexttospeech_mock_plugin.h @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHPLUGIN_MOCK_H #define QTEXTTOSPEECHPLUGIN_MOCK_H diff --git a/src/plugins/tts/sapi/qtexttospeech_sapi.cpp b/src/plugins/tts/sapi/qtexttospeech_sapi.cpp index 0d35214..67d81ea 100644 --- a/src/plugins/tts/sapi/qtexttospeech_sapi.cpp +++ b/src/plugins/tts/sapi/qtexttospeech_sapi.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeech_sapi.h" diff --git a/src/plugins/tts/sapi/qtexttospeech_sapi.h b/src/plugins/tts/sapi/qtexttospeech_sapi.h index 13ac225..0582bf2 100644 --- a/src/plugins/tts/sapi/qtexttospeech_sapi.h +++ b/src/plugins/tts/sapi/qtexttospeech_sapi.h @@ -1,5 +1,5 @@ // Copyright (C) 2015 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHENGINE_SAPI_H #define QTEXTTOSPEECHENGINE_SAPI_H diff --git a/src/plugins/tts/sapi/qtexttospeech_sapi_plugin.cpp b/src/plugins/tts/sapi/qtexttospeech_sapi_plugin.cpp index 0ca5a92..4dc2573 100644 --- a/src/plugins/tts/sapi/qtexttospeech_sapi_plugin.cpp +++ b/src/plugins/tts/sapi/qtexttospeech_sapi_plugin.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeech_sapi_plugin.h" #include "qtexttospeech_sapi.h" diff --git a/src/plugins/tts/sapi/qtexttospeech_sapi_plugin.h b/src/plugins/tts/sapi/qtexttospeech_sapi_plugin.h index 854ab65..da0ea03 100644 --- a/src/plugins/tts/sapi/qtexttospeech_sapi_plugin.h +++ b/src/plugins/tts/sapi/qtexttospeech_sapi_plugin.h @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHPLUGIN_SAPI_H #define QTEXTTOSPEECHPLUGIN_SAPI_H diff --git a/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.cpp b/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.cpp index f93ea1c..84e4d60 100644 --- a/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.cpp +++ b/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.cpp @@ -1,11 +1,12 @@ // Copyright (C) 2015 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeech_speechd.h" #include <QtCore/QDebug> #include <QtCore/QCoreApplication> +#include <QtCore/QLoggingCategory> #include <libspeechd.h> @@ -15,6 +16,8 @@ QT_BEGIN_NAMESPACE +Q_LOGGING_CATEGORY(lcSpeechTtsSpeechd, "qt.speech.tts.speechd") + typedef QList<QTextToSpeechEngineSpeechd*> QTextToSpeechSpeechDispatcherBackendList; Q_GLOBAL_STATIC(QTextToSpeechSpeechDispatcherBackendList, backends) @@ -385,7 +388,7 @@ QList<QVoice> QTextToSpeechEngineSpeechd::availableVoices() const // (history functions are just stubs) void speech_finished_callback(size_t msg_id, size_t client_id, SPDNotificationType state) { - qDebug() << "Message from speech dispatcher" << msg_id << client_id; + qCDebug(lcSpeechTtsSpeechd) << "Message from speech dispatcher" << msg_id << client_id; for (QTextToSpeechEngineSpeechd *backend : std::as_const(*backends)) backend->spdStateChanged(state); } diff --git a/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.h b/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.h index b9aaf9f..2c4bb79 100644 --- a/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.h +++ b/src/plugins/tts/speechdispatcher/qtexttospeech_speechd.h @@ -1,5 +1,5 @@ // Copyright (C) 2015 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHENGINE_SPEECHD_H #define QTEXTTOSPEECHENGINE_SPEECHD_H diff --git a/src/plugins/tts/speechdispatcher/qtexttospeech_speechd_plugin.cpp b/src/plugins/tts/speechdispatcher/qtexttospeech_speechd_plugin.cpp index 56e07a2..de65309 100644 --- a/src/plugins/tts/speechdispatcher/qtexttospeech_speechd_plugin.cpp +++ b/src/plugins/tts/speechdispatcher/qtexttospeech_speechd_plugin.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeech_speechd_plugin.h" #include "qtexttospeech_speechd.h" diff --git a/src/plugins/tts/speechdispatcher/qtexttospeech_speechd_plugin.h b/src/plugins/tts/speechdispatcher/qtexttospeech_speechd_plugin.h index a83c94c..b3c2c2c 100644 --- a/src/plugins/tts/speechdispatcher/qtexttospeech_speechd_plugin.h +++ b/src/plugins/tts/speechdispatcher/qtexttospeech_speechd_plugin.h @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHPLUGIN_SPEECHD_H #define QTEXTTOSPEECHPLUGIN_SPEECHD_H @@ -8,12 +8,9 @@ #include "qtexttospeechengine.h" #include <QtCore/QObject> -#include <QtCore/QLoggingCategory> QT_BEGIN_NAMESPACE -//Q_DECLARE_LOGGING_CATEGORY(lcSpeechTtsSpeechd) - class QTextToSpeechSpeechdPlugin : public QObject, public QTextToSpeechPlugin { Q_OBJECT diff --git a/src/plugins/tts/winrt/qtexttospeech_winrt.cpp b/src/plugins/tts/winrt/qtexttospeech_winrt.cpp index dd8e78a..4bd798e 100644 --- a/src/plugins/tts/winrt/qtexttospeech_winrt.cpp +++ b/src/plugins/tts/winrt/qtexttospeech_winrt.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeech_winrt.h" #include "qtexttospeech_winrt_audiosource.h" diff --git a/src/plugins/tts/winrt/qtexttospeech_winrt.h b/src/plugins/tts/winrt/qtexttospeech_winrt.h index 045f8e0..455b429 100644 --- a/src/plugins/tts/winrt/qtexttospeech_winrt.h +++ b/src/plugins/tts/winrt/qtexttospeech_winrt.h @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHENGINE_WINRT_H #define QTEXTTOSPEECHENGINE_WINRT_H diff --git a/src/plugins/tts/winrt/qtexttospeech_winrt_audiosource.cpp b/src/plugins/tts/winrt/qtexttospeech_winrt_audiosource.cpp index 51d3505..0149ef0 100644 --- a/src/plugins/tts/winrt/qtexttospeech_winrt_audiosource.cpp +++ b/src/plugins/tts/winrt/qtexttospeech_winrt_audiosource.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeech_winrt_audiosource.h" diff --git a/src/plugins/tts/winrt/qtexttospeech_winrt_audiosource.h b/src/plugins/tts/winrt/qtexttospeech_winrt_audiosource.h index da6e901..d797c7f 100644 --- a/src/plugins/tts/winrt/qtexttospeech_winrt_audiosource.h +++ b/src/plugins/tts/winrt/qtexttospeech_winrt_audiosource.h @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHENGINE_WINRT_AUDIOSOURCE_H #define QTEXTTOSPEECHENGINE_WINRT_AUDIOSOURCE_H diff --git a/src/plugins/tts/winrt/qtexttospeech_winrt_plugin.cpp b/src/plugins/tts/winrt/qtexttospeech_winrt_plugin.cpp index 3ca6b4e..5a67e29 100644 --- a/src/plugins/tts/winrt/qtexttospeech_winrt_plugin.cpp +++ b/src/plugins/tts/winrt/qtexttospeech_winrt_plugin.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeech_winrt_plugin.h" #include "qtexttospeech_winrt.h" diff --git a/src/plugins/tts/winrt/qtexttospeech_winrt_plugin.h b/src/plugins/tts/winrt/qtexttospeech_winrt_plugin.h index 5b21812..de722ca 100644 --- a/src/plugins/tts/winrt/qtexttospeech_winrt_plugin.h +++ b/src/plugins/tts/winrt/qtexttospeech_winrt_plugin.h @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHPLUGIN_WINRT_H #define QTEXTTOSPEECHPLUGIN_WINRT_H diff --git a/src/tts/qtexttospeech.cpp b/src/tts/qtexttospeech.cpp index 8018a8f..751cd52 100644 --- a/src/tts/qtexttospeech.cpp +++ b/src/tts/qtexttospeech.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2015 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeech.h" diff --git a/src/tts/qtexttospeech.h b/src/tts/qtexttospeech.h index db40929..20cdcda 100644 --- a/src/tts/qtexttospeech.h +++ b/src/tts/qtexttospeech.h @@ -1,5 +1,5 @@ // Copyright (C) 2015 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only diff --git a/src/tts/qtexttospeech_global.h b/src/tts/qtexttospeech_global.h index c232fd5..b4dc1a6 100644 --- a/src/tts/qtexttospeech_global.h +++ b/src/tts/qtexttospeech_global.h @@ -1,5 +1,5 @@ // Copyright (C) 2015 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only diff --git a/src/tts/qtexttospeech_p.h b/src/tts/qtexttospeech_p.h index 14128db..f5a5906 100644 --- a/src/tts/qtexttospeech_p.h +++ b/src/tts/qtexttospeech_p.h @@ -1,5 +1,5 @@ // Copyright (C) 2015 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only diff --git a/src/tts/qtexttospeechengine.cpp b/src/tts/qtexttospeechengine.cpp index 44bd549..3f24c7d 100644 --- a/src/tts/qtexttospeechengine.cpp +++ b/src/tts/qtexttospeechengine.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeechengine.h" diff --git a/src/tts/qtexttospeechengine.h b/src/tts/qtexttospeechengine.h index b62d2d1..283bfe5 100644 --- a/src/tts/qtexttospeechengine.h +++ b/src/tts/qtexttospeechengine.h @@ -1,5 +1,5 @@ // Copyright (C) 2015 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHENGINE_H #define QTEXTTOSPEECHENGINE_H diff --git a/src/tts/qtexttospeechplugin.cpp b/src/tts/qtexttospeechplugin.cpp index 5f238fa..dbbee4c 100644 --- a/src/tts/qtexttospeechplugin.cpp +++ b/src/tts/qtexttospeechplugin.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtexttospeechplugin.h" diff --git a/src/tts/qtexttospeechplugin.h b/src/tts/qtexttospeechplugin.h index 3ae9155..0ed6244 100644 --- a/src/tts/qtexttospeechplugin.h +++ b/src/tts/qtexttospeechplugin.h @@ -1,5 +1,5 @@ // Copyright (C) 2015 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTTOSPEECHPLUGIN_H #define QTEXTTOSPEECHPLUGIN_H diff --git a/src/tts/qvoice.cpp b/src/tts/qvoice.cpp index dceff7a..b9d0cf2 100644 --- a/src/tts/qvoice.cpp +++ b/src/tts/qvoice.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only diff --git a/src/tts/qvoice.h b/src/tts/qvoice.h index 286c137..7d181fd 100644 --- a/src/tts/qvoice.h +++ b/src/tts/qvoice.h @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QVOICE_H #define QVOICE_H diff --git a/src/tts/qvoice_p.h b/src/tts/qvoice_p.h index 9ba398c..cb07055 100644 --- a/src/tts/qvoice_p.h +++ b/src/tts/qvoice_p.h @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only |