From 53afd0808aeae53bf1ad94647be936cce00ef9a1 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 12 Dec 2017 09:56:10 +0100 Subject: Bump version Change-Id: I44ced9cc864f3c02d62774844481379577eeac7e --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index e285bea..85c58cc 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += qt_example_installs CONFIG += warning_clean -MODULE_VERSION = 5.9.3 +MODULE_VERSION = 5.9.4 -- cgit v1.2.3 From 16ab9c262b1d53222913da96f7a14485e3ef0836 Mon Sep 17 00:00:00 2001 From: Sergio Martins Date: Tue, 19 Dec 2017 15:13:06 +0000 Subject: Fix static build with mingw and ICC Change-Id: I859eb100644ae57a96562a95796b815685ca1c38 Task-number: QTBUG-62206 Reviewed-by: Friedemann Kleint --- src/tts/qtexttospeech_global.h | 10 +++++++--- 1 file 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 -- cgit v1.2.3 From 964b71d8b92cdbbbbf49ecd2b3fbc55a240f6d4f Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 20 Dec 2017 12:07:21 +0100 Subject: Bump version Change-Id: I485b1708da2e994c7e7c43b07e10be54e6be7767 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 6435234..4c5fedd 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += qt_example_installs CONFIG += warning_clean -MODULE_VERSION = 5.10.0 +MODULE_VERSION = 5.10.1 -- cgit v1.2.3 From e7f2b89f4b400003b3da6d41507dba31c822aaf8 Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Fri, 12 Jan 2018 13:32:13 +0100 Subject: qtlite: Skip building examples when configured with no-feature-itemviews Task-number: QTBUG-53141 Change-Id: Ia0ac2009e60e31f945c2af1716c4c4b13028c167 Reviewed-by: Maurice Kalinowski --- examples/speech/hello_speak/hello_speak.pro | 1 + 1 file changed, 1 insertion(+) 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 -- cgit v1.2.3