summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2019-04-01 09:40:05 +0200
committerFrederik Gladhorn <frederik.gladhorn@qt.io>2019-04-01 15:24:01 +0000
commitc79b11cbf4eb6e72d32eb98a262201341018b620 (patch)
tree986b905ec46cb25bf0d05e6208bf497cefd9a0fc
parentd6d6bae390b90ff341d08e7d4d51c4f7ccd972c2 (diff)
Switch export macros to standard formv5.13.0-beta3v5.13.0-beta2
Qt expects the export macros to have Q_ prefixes, otherwise the symbol versioning script won't find them and mark them. Task-number: QTBUG-73752 Change-Id: I5e50eff00faacbbcb0d0d4fd3273ca55c64c1844 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
-rw-r--r--src/tts/qtexttospeech.h2
-rw-r--r--src/tts/qtexttospeech_global.h6
-rw-r--r--src/tts/qtexttospeechengine.h2
-rw-r--r--src/tts/qtexttospeechplugin.h2
-rw-r--r--src/tts/qvoice.h2
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 {