diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-05-24 12:59:17 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-05-25 16:34:22 +0200 |
| commit | c42fd8a4314d635205a7fbf9a598115ec2e0aaa2 (patch) | |
| tree | ff2877da8682fd8f713abc38f2bca1f5f51b47fd | |
| parent | ab856365fe31da9a375faeaaea134f6a71d523ec (diff) | |
Don't make QtTextToSpeech module depend on QtQml
Declare a separate target.
Change-Id: I84aced3d602183aa03a65c55c443db95c0ef9190
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | src/tts/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/tts/qtexttospeech.h | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/tts/CMakeLists.txt b/src/tts/CMakeLists.txt index 5047c5d..448aec6 100644 --- a/src/tts/CMakeLists.txt +++ b/src/tts/CMakeLists.txt @@ -3,7 +3,6 @@ qt_internal_add_module(TextToSpeech SOURCES qtexttospeech.cpp qtexttospeech.h qtexttospeech_p.h qtexttospeech_global.h - qtexttospeech_qmltypes_p.h qtexttospeechengine.cpp qtexttospeechengine.h qtexttospeechplugin.cpp qtexttospeechplugin.h qvoice.cpp qvoice.h qvoice_p.h @@ -11,21 +10,23 @@ qt_internal_add_module(TextToSpeech QTEXTTOSPEECH_LIBRARY LIBRARIES Qt::CorePrivate + Qt::QmlIntegration PUBLIC_LIBRARIES Qt::Core PRIVATE_MODULE_INTERFACE Qt::CorePrivate ) + if(TARGET Qt::Qml) - qt_internal_add_qml_module(TextToSpeech + qt_internal_add_qml_module(TextToSpeechQml URI "QtTextToSpeech" VERSION "${PROJECT_VERSION}" + PLUGIN_TARGET TextToSpeechQml SOURCES qtexttospeech_qmltypes_p.h PUBLIC_LIBRARIES Qt::TextToSpeech - GENERATE_CPP_EXPORTS ) endif() diff --git a/src/tts/qtexttospeech.h b/src/tts/qtexttospeech.h index efae715..a900e1d 100644 --- a/src/tts/qtexttospeech.h +++ b/src/tts/qtexttospeech.h @@ -47,12 +47,15 @@ #include <QtCore/qlocale.h> #include <QtTextToSpeech/qvoice.h> +#include <QtQmlIntegration/qqmlintegration.h> + QT_BEGIN_NAMESPACE class QTextToSpeechPrivate; class Q_TEXTTOSPEECH_EXPORT QTextToSpeech : public QObject { Q_OBJECT + QML_ELEMENT 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) |