diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-09 03:00:47 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-09 03:00:47 +0100 |
| commit | f98930fc465412d5921486ec0497bb5d5b74ae8b (patch) | |
| tree | 29805278cc18ea81e8e00f9cb9d8c5adf5e3cb52 | |
| parent | 4a972ad8027b2e4845a8a3ac3f119dc0f3b05407 (diff) | |
| parent | ca42f92ab22c26fbcd6b1408ef57ed5199313456 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1
Change-Id: I2dcc88317f8cbe1db61a30fdb0214320262bbd1d
| -rw-r--r-- | examples/speech/hello_speak/hello_speak.pro | 3 | ||||
| -rw-r--r-- | src/doc/doc.pro | 2 | ||||
| -rw-r--r-- | src/plugins/tts/speechdispatcher/speechdispatcher.pro | 2 | ||||
| -rw-r--r-- | src/plugins/tts/tts.pro | 2 | ||||
| -rw-r--r-- | tests/auto/texttospeech/texttospeech.pro | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/examples/speech/hello_speak/hello_speak.pro b/examples/speech/hello_speak/hello_speak.pro index e770adf..575e041 100644 --- a/examples/speech/hello_speak/hello_speak.pro +++ b/examples/speech/hello_speak/hello_speak.pro @@ -1,7 +1,8 @@ TEMPLATE = app QT += widgets texttospeech -requires(qtConfig(combobox)) +requires(qtHaveModule(gui)) +qtHaveModule(gui): requires(qtConfig(combobox)) SOURCES = main.cpp \ mainwindow.cpp diff --git a/src/doc/doc.pro b/src/doc/doc.pro index b6168b6..9557fc8 100644 --- a/src/doc/doc.pro +++ b/src/doc/doc.pro @@ -1,7 +1,7 @@ TEMPLATE = aux CONFIG += force_qt -QT += core-private +QT = core-private QMAKE_DOCS = $$PWD/qtspeech.qdocconf diff --git a/src/plugins/tts/speechdispatcher/speechdispatcher.pro b/src/plugins/tts/speechdispatcher/speechdispatcher.pro index b8a984e..a6795e5 100644 --- a/src/plugins/tts/speechdispatcher/speechdispatcher.pro +++ b/src/plugins/tts/speechdispatcher/speechdispatcher.pro @@ -4,7 +4,7 @@ PLUGIN_CLASS_NAME = QTextToSpeechPluginSpeechd load(qt_plugin) -QT += core texttospeech +QT = core texttospeech CONFIG += link_pkgconfig packagesExist(speech-dispatcher): PKGCONFIG = speech-dispatcher diff --git a/src/plugins/tts/tts.pro b/src/plugins/tts/tts.pro index e97c3cd..7307e40 100644 --- a/src/plugins/tts/tts.pro +++ b/src/plugins/tts/tts.pro @@ -16,5 +16,5 @@ uikit: SUBDIRS += ios android: SUBDIRS += android config_flite | config_flite_alsa { - SUBDIRS += flite + qtHaveModule(multimedia): SUBDIRS += flite } diff --git a/tests/auto/texttospeech/texttospeech.pro b/tests/auto/texttospeech/texttospeech.pro index fdbe826..4ca4419 100644 --- a/tests/auto/texttospeech/texttospeech.pro +++ b/tests/auto/texttospeech/texttospeech.pro @@ -1,6 +1,6 @@ CONFIG += testcase TARGET = tst_qtexttospeech -QT += testlib core texttospeech +QT = testlib core texttospeech SOURCES += tst_qtexttospeech.cpp unix { |