diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:45:22 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:45:38 +0100 |
| commit | 0b3b3431429efd7f7aca751afeeb862c1ff4f9fb (patch) | |
| tree | d07830ba96a72becc9aeea52fd5d5e035b5653a2 | |
| parent | 3eb41567fb539e3b4f640645fe05da7e962ef850 (diff) | |
| parent | f5aaee80166be7969a71496d2fd9a8152d8effb4 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
Change-Id: I5cfde4f3e47124171a12b2646d72c2676193ebe6
| -rw-r--r-- | examples/speech/hello_speak/hello_speak.pro | 1 | ||||
| -rw-r--r-- | src/tts/qtexttospeech_global.h | 10 |
2 files changed, 8 insertions, 3 deletions
diff --git a/examples/speech/hello_speak/hello_speak.pro b/examples/speech/hello_speak/hello_speak.pro index ca5ecc4..e770adf 100644 --- a/examples/speech/hello_speak/hello_speak.pro +++ b/examples/speech/hello_speak/hello_speak.pro @@ -1,6 +1,7 @@ TEMPLATE = app QT += widgets texttospeech +requires(qtConfig(combobox)) SOURCES = main.cpp \ mainwindow.cpp 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 |