diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-06 08:57:05 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-09-08 13:11:16 +0000 |
| commit | 5393b76f3780b0be33cc727458993223605e5ab1 (patch) | |
| tree | b793275da1e797033705ad762e551213d65f6691 /tests | |
| parent | d9f592f38ce7fb5a4fe5bd540b2ae9baf16760cc (diff) | |
Add configure test for speechd when pkg-config file is not availablev5.9.2
Sadly older speech-dispatcher versions (on RHEL where we package) seem
to not yet ship the correct pkg-config stuff, so try to manually detect
the presence of speechd, so that we finally have linux packages.
And for speech-dispatcher-devel packages (on RHEL where we package),
different versions have different include path. 0.8.7 has
/usr/include/speech-dispatcher and 0.7.1 has /usr/include.
Task-number: QTBUG-58461
Done-with: Frederik Gladhorn<frederik.gladhorn@qt.io>
Change-Id: Ib3946cc7b84411f509dc74f6022831cb16d88b2e
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/texttospeech/texttospeech.pro | 5 | ||||
| -rw-r--r-- | tests/auto/texttospeech/tst_qtexttospeech.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/auto/texttospeech/texttospeech.pro b/tests/auto/texttospeech/texttospeech.pro index 8789213..fdbe826 100644 --- a/tests/auto/texttospeech/texttospeech.pro +++ b/tests/auto/texttospeech/texttospeech.pro @@ -5,8 +5,9 @@ SOURCES += tst_qtexttospeech.cpp unix { CONFIG += link_pkgconfig - packagesExist(speech-dispatcher) { - PKGCONFIG = speech-dispatcher + packagesExist(speech-dispatcher): PKGCONFIG = speech-dispatcher + config_speechd | packagesExist(speech-dispatcher) { DEFINES += HAVE_SPEECHD } + config_speechd: LIBS += -lspeechd } diff --git a/tests/auto/texttospeech/tst_qtexttospeech.cpp b/tests/auto/texttospeech/tst_qtexttospeech.cpp index 2e54d78..9e828e0 100644 --- a/tests/auto/texttospeech/tst_qtexttospeech.cpp +++ b/tests/auto/texttospeech/tst_qtexttospeech.cpp @@ -40,7 +40,7 @@ #include <QSignalSpy> #if defined(HAVE_SPEECHD) - #include <speech-dispatcher/libspeechd.h> + #include <libspeechd.h> #if LIBSPEECHD_MAJOR_VERSION == 0 && LIBSPEECHD_MINOR_VERSION < 9 #define HAVE_SPEECHD_BEFORE_090 #endif |