diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-06 03:03:29 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-06 03:03:29 +0200 |
commit | 6b3d03f56f4f58121f21f9fe38f51ce45d0130a8 (patch) | |
tree | f9a3864bbc12cead51cbe42ac944842e276cc0e6 | |
parent | a448e94579ed5495b2bb2c3105b73ae5acb735de (diff) | |
parent | c79b11cbf4eb6e72d32eb98a262201341018b620 (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I342c7ae5cfcf1f2c6abb18331c7740f3be4deedc
-rw-r--r-- | src/tts/qtexttospeech.h | 2 | ||||
-rw-r--r-- | src/tts/qtexttospeech_global.h | 6 | ||||
-rw-r--r-- | src/tts/qtexttospeechengine.h | 2 | ||||
-rw-r--r-- | src/tts/qtexttospeechplugin.h | 2 | ||||
-rw-r--r-- | src/tts/qvoice.h | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/tts/qtexttospeech.h b/src/tts/qtexttospeech.h index 57974f3..96802da 100644 --- a/src/tts/qtexttospeech.h +++ b/src/tts/qtexttospeech.h @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE class QTextToSpeechPrivate; -class QTEXTTOSPEECH_EXPORT QTextToSpeech : public QObject +class Q_TEXTTOSPEECH_EXPORT QTextToSpeech : public QObject { Q_OBJECT Q_ENUMS(QTextToSpeech::State) diff --git a/src/tts/qtexttospeech_global.h b/src/tts/qtexttospeech_global.h index 3f3712d..9941082 100644 --- a/src/tts/qtexttospeech_global.h +++ b/src/tts/qtexttospeech_global.h @@ -45,12 +45,12 @@ QT_BEGIN_NAMESPACE #ifndef QT_STATIC # if defined(QTEXTTOSPEECH_LIBRARY) -# define QTEXTTOSPEECH_EXPORT Q_DECL_EXPORT +# define Q_TEXTTOSPEECH_EXPORT Q_DECL_EXPORT # else -# define QTEXTTOSPEECH_EXPORT Q_DECL_IMPORT +# define Q_TEXTTOSPEECH_EXPORT Q_DECL_IMPORT # endif #else -# define QTEXTTOSPEECH_EXPORT +# define Q_TEXTTOSPEECH_EXPORT #endif QT_END_NAMESPACE diff --git a/src/tts/qtexttospeechengine.h b/src/tts/qtexttospeechengine.h index aef7f71..0b5e71a 100644 --- a/src/tts/qtexttospeechengine.h +++ b/src/tts/qtexttospeechengine.h @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE -class QTEXTTOSPEECH_EXPORT QTextToSpeechEngine : public QObject +class Q_TEXTTOSPEECH_EXPORT QTextToSpeechEngine : public QObject { Q_OBJECT diff --git a/src/tts/qtexttospeechplugin.h b/src/tts/qtexttospeechplugin.h index b730651..b403e44 100644 --- a/src/tts/qtexttospeechplugin.h +++ b/src/tts/qtexttospeechplugin.h @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE -class QTEXTTOSPEECH_EXPORT QTextToSpeechPlugin +class Q_TEXTTOSPEECH_EXPORT QTextToSpeechPlugin { public: virtual ~QTextToSpeechPlugin() {} diff --git a/src/tts/qvoice.h b/src/tts/qvoice.h index e7f1021..26931a6 100644 --- a/src/tts/qvoice.h +++ b/src/tts/qvoice.h @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE class QVoicePrivate; class QVariant; -class QTEXTTOSPEECH_EXPORT QVoice +class Q_TEXTTOSPEECH_EXPORT QVoice { public: enum Gender { |