diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2022-03-23 19:29:25 +0100 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2022-03-23 19:34:30 +0100 |
commit | f3b19de594bc68449fab0f42426e971bae2c7ad9 (patch) | |
tree | fbcfca8dffafd69f5233e9ef936311d994514d3d | |
parent | 00ec195c262acd152537901bf9a5e881d6e40eb3 (diff) | |
download | rockbox-f3b19de594bc68449fab0f42426e971bae2c7ad9.tar.gz rockbox-f3b19de594bc68449fab0f42426e971bae2c7ad9.zip |
rbutil: Disable TTS test on Qt6.
Qt6 has QMultimedia, but QSound has been removed. It's only use for
playing a TTS test sample. Disable that for now.
Change-Id: Id3b5c834f9579a43e390c0c00a4c1a35b59182bd
-rw-r--r-- | utils/rbutilqt/configure.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/utils/rbutilqt/configure.cpp b/utils/rbutilqt/configure.cpp index 169499800e..a544c8528a 100644 --- a/utils/rbutilqt/configure.cpp +++ b/utils/rbutilqt/configure.cpp | |||
@@ -20,7 +20,7 @@ | |||
20 | #include <QProgressDialog> | 20 | #include <QProgressDialog> |
21 | #include <QFileDialog> | 21 | #include <QFileDialog> |
22 | #include <QUrl> | 22 | #include <QUrl> |
23 | #ifdef QT_MULTIMEDIA_LIB | 23 | #if defined(QT_MULTIMEDIA_LIB) && (QT_VERSION < 0x060000) |
24 | #include <QSound> | 24 | #include <QSound> |
25 | #endif | 25 | #endif |
26 | 26 | ||
@@ -444,7 +444,7 @@ void Config::updateTtsState(int index) | |||
444 | { | 444 | { |
445 | ui.configTTSstatus->setText(tr("Configuration OK")); | 445 | ui.configTTSstatus->setText(tr("Configuration OK")); |
446 | ui.configTTSstatusimg->setPixmap(QPixmap(QString::fromUtf8(":/icons/go-next.svg"))); | 446 | ui.configTTSstatusimg->setPixmap(QPixmap(QString::fromUtf8(":/icons/go-next.svg"))); |
447 | #ifdef QT_MULTIMEDIA_LIB | 447 | #if defined(QT_MULTIMEDIA_LIB) && (QT_VERSION < 0x060000) |
448 | ui.testTTS->setEnabled(true); | 448 | ui.testTTS->setEnabled(true); |
449 | #else | 449 | #else |
450 | ui.testTTS->setEnabled(false); | 450 | ui.testTTS->setEnabled(false); |
@@ -894,7 +894,7 @@ void Config::configTts() | |||
894 | 894 | ||
895 | void Config::testTts() | 895 | void Config::testTts() |
896 | { | 896 | { |
897 | #ifdef QT_MULTIMEDIA_LIB | 897 | #if defined(QT_MULTIMEDIA_LIB) && (QT_VERSION < 0x060000) |
898 | QString errstr; | 898 | QString errstr; |
899 | int index = ui.comboTts->currentIndex(); | 899 | int index = ui.comboTts->currentIndex(); |
900 | TTSBase* tts; | 900 | TTSBase* tts; |