diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2023-06-07 16:53:18 +0200 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2023-06-07 21:56:03 +0200 |
commit | 9e03c28243e6e8af6b7e000a4d53bb112a7c27b0 (patch) | |
tree | 28b55b16430cf54318dd338e3fbf8a418e1273e6 | |
parent | ff1db26dd8ca68121da853bcd53e623b63b4123d (diff) |
API review: add revision tags and make properties FINAL
Add 6.6 revision tags to new properties and invokables, and make
all properties FINAL.
The `engine` property is only made FINAL in the QML wrapper class,
as it needs to override that property to replace getters and setters
to support lazy initialization.
Pick-to: 6.6
Change-Id: I266b5a3229978f4da9998366af83d77fa744d434
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
-rw-r--r-- | src/tts/qml/qdeclarativetexttospeech_p.h | 6 | ||||
-rw-r--r-- | src/tts/qtexttospeech.h | 14 | ||||
-rw-r--r-- | src/tts/qvoice.h | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/tts/qml/qdeclarativetexttospeech_p.h b/src/tts/qml/qdeclarativetexttospeech_p.h index 205c1a5..1e97240 100644 --- a/src/tts/qml/qdeclarativetexttospeech_p.h +++ b/src/tts/qml/qdeclarativetexttospeech_p.h @@ -28,7 +28,7 @@ class QDeclarativeTextToSpeech : public QTextToSpeech, public QQmlParserStatus { Q_OBJECT Q_PROPERTY(QString engine READ engine WRITE setEngine NOTIFY engineChanged FINAL) - Q_PROPERTY(QVariantMap engineParameters READ engineParameters WRITE setEngineParameters NOTIFY engineParametersChanged FINAL) + Q_PROPERTY(QVariantMap engineParameters READ engineParameters WRITE setEngineParameters NOTIFY engineParametersChanged REVISION(6, 6) FINAL) Q_INTERFACES(QQmlParserStatus) QML_NAMED_ELEMENT(TextToSpeech) @@ -36,7 +36,7 @@ class QDeclarativeTextToSpeech : public QTextToSpeech, public QQmlParserStatus public: explicit QDeclarativeTextToSpeech(QObject *parent = nullptr); - Q_INVOKABLE QList<QVoice> findVoices(const QVariantMap &criteria) const; + Q_REVISION(6, 6) Q_INVOKABLE QList<QVoice> findVoices(const QVariantMap &criteria) const; QVoiceSelectorAttached *m_voiceSelector = nullptr; @@ -50,7 +50,7 @@ public: Q_SIGNALS: void engineChanged(const QString &); - void engineParametersChanged(); + Q_REVISION(6, 6) void engineParametersChanged(); protected: void classBegin() override; diff --git a/src/tts/qtexttospeech.h b/src/tts/qtexttospeech.h index 88c6b2a..8b4bd17 100644 --- a/src/tts/qtexttospeech.h +++ b/src/tts/qtexttospeech.h @@ -24,13 +24,13 @@ class Q_TEXTTOSPEECH_EXPORT QTextToSpeech : public QObject { Q_OBJECT Q_PROPERTY(QString engine READ engine WRITE setEngine NOTIFY engineChanged) - Q_PROPERTY(State state READ state NOTIFY stateChanged) - Q_PROPERTY(double volume READ volume WRITE setVolume NOTIFY volumeChanged) - Q_PROPERTY(double rate READ rate WRITE setRate NOTIFY rateChanged) - Q_PROPERTY(double pitch READ pitch WRITE setPitch NOTIFY pitchChanged) - Q_PROPERTY(QLocale locale READ locale WRITE setLocale NOTIFY localeChanged) - Q_PROPERTY(QVoice voice READ voice WRITE setVoice NOTIFY voiceChanged) - Q_PROPERTY(Capabilities engineCapabilities READ engineCapabilities NOTIFY engineChanged) + Q_PROPERTY(State state READ state NOTIFY stateChanged FINAL) + Q_PROPERTY(double volume READ volume WRITE setVolume NOTIFY volumeChanged FINAL) + Q_PROPERTY(double rate READ rate WRITE setRate NOTIFY rateChanged FINAL) + Q_PROPERTY(double pitch READ pitch WRITE setPitch NOTIFY pitchChanged FINAL) + Q_PROPERTY(QLocale locale READ locale WRITE setLocale NOTIFY localeChanged FINAL) + Q_PROPERTY(QVoice voice READ voice WRITE setVoice NOTIFY voiceChanged FINAL) + Q_PROPERTY(Capabilities engineCapabilities READ engineCapabilities NOTIFY engineChanged REVISION(6, 6) FINAL) Q_DECLARE_PRIVATE(QTextToSpeech) public: diff --git a/src/tts/qvoice.h b/src/tts/qvoice.h index 4a336fc..78c04b2 100644 --- a/src/tts/qvoice.h +++ b/src/tts/qvoice.h @@ -23,7 +23,7 @@ class Q_TEXTTOSPEECH_EXPORT QVoice Q_PROPERTY(Gender gender READ gender CONSTANT) Q_PROPERTY(Age age READ age CONSTANT) Q_PROPERTY(QLocale locale READ locale CONSTANT) - Q_PROPERTY(QLocale::Language language READ language STORED false) + Q_PROPERTY(QLocale::Language language READ language STORED false REVISION(6, 6)) public: enum Gender { |