diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-18 18:03:28 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-18 21:42:26 +0100 |
| commit | f5aaee80166be7969a71496d2fd9a8152d8effb4 (patch) | |
| tree | ff230f2e91098162aa110c5a5d2e91d9d623824f | |
| parent | e7f2b89f4b400003b3da6d41507dba31c822aaf8 (diff) | |
| parent | 16ab9c262b1d53222913da96f7a14485e3ef0836 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.1
Conflicts:
.qmake.conf
Change-Id: I97db16ba0b3d6021c780b9670c11c276362a1b7d
| -rw-r--r-- | src/tts/qtexttospeech_global.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/tts/qtexttospeech_global.h b/src/tts/qtexttospeech_global.h index 9b9eb15..3f3712d 100644 --- a/src/tts/qtexttospeech_global.h +++ b/src/tts/qtexttospeech_global.h @@ -43,10 +43,14 @@ QT_BEGIN_NAMESPACE -#if defined(QTEXTTOSPEECH_LIBRARY) -# define QTEXTTOSPEECH_EXPORT Q_DECL_EXPORT +#ifndef QT_STATIC +# if defined(QTEXTTOSPEECH_LIBRARY) +# define QTEXTTOSPEECH_EXPORT Q_DECL_EXPORT +# else +# define QTEXTTOSPEECH_EXPORT Q_DECL_IMPORT +# endif #else -# define QTEXTTOSPEECH_EXPORT Q_DECL_IMPORT +# define QTEXTTOSPEECH_EXPORT #endif QT_END_NAMESPACE |