diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-07-27 21:15:37 +0200 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-08-16 12:14:30 +0200 |
commit | d5820ff779397c9de50286d401c5d6422fb84fcb (patch) | |
tree | a3b2df4cabd3f05dfab7dd720f4631a1a9a3fa85 | |
parent | 7c9a7ed406e1e7e079759b0048280a05e453eb10 (diff) | |
download | rockbox-d5820ff779397c9de50286d401c5d6422fb84fcb.tar.gz rockbox-d5820ff779397c9de50286d401c5d6422fb84fcb.zip |
rbutil: Qt6: allow building without Multimedia module.
Qt6 beta doesn't include the Multimedia module. Allow building without,
and disable on Qt6 for now.
Change-Id: Ie2ad25c81d9c62c8c6e8efaf8309b3600afce1d0
-rw-r--r-- | rbutil/rbutilqt/configure.cpp | 8 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.pro | 5 |
2 files changed, 12 insertions, 1 deletions
diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp index ab0281774d..80b54c163b 100644 --- a/rbutil/rbutilqt/configure.cpp +++ b/rbutil/rbutilqt/configure.cpp | |||
@@ -20,7 +20,9 @@ | |||
20 | #include <QProgressDialog> | 20 | #include <QProgressDialog> |
21 | #include <QFileDialog> | 21 | #include <QFileDialog> |
22 | #include <QUrl> | 22 | #include <QUrl> |
23 | #ifdef QT_MULTIMEDIA_LIB | ||
23 | #include <QSound> | 24 | #include <QSound> |
25 | #endif | ||
24 | 26 | ||
25 | #include "version.h" | 27 | #include "version.h" |
26 | #include "configure.h" | 28 | #include "configure.h" |
@@ -446,7 +448,11 @@ void Config::updateTtsState(int index) | |||
446 | { | 448 | { |
447 | ui.configTTSstatus->setText(tr("Configuration OK")); | 449 | ui.configTTSstatus->setText(tr("Configuration OK")); |
448 | ui.configTTSstatusimg->setPixmap(QPixmap(QString::fromUtf8(":/icons/go-next.png"))); | 450 | ui.configTTSstatusimg->setPixmap(QPixmap(QString::fromUtf8(":/icons/go-next.png"))); |
451 | #ifdef QT_MULTIMEDIA_LIB | ||
449 | ui.testTTS->setEnabled(true); | 452 | ui.testTTS->setEnabled(true); |
453 | #else | ||
454 | ui.testTTS->setEnabled(false); | ||
455 | #endif | ||
450 | } | 456 | } |
451 | else | 457 | else |
452 | { | 458 | { |
@@ -895,6 +901,7 @@ void Config::configTts() | |||
895 | 901 | ||
896 | void Config::testTts() | 902 | void Config::testTts() |
897 | { | 903 | { |
904 | #ifdef QT_MULTIMEDIA_LIB | ||
898 | QString errstr; | 905 | QString errstr; |
899 | int index = ui.comboTts->currentIndex(); | 906 | int index = ui.comboTts->currentIndex(); |
900 | TTSBase* tts; | 907 | TTSBase* tts; |
@@ -947,6 +954,7 @@ void Config::testTts() | |||
947 | delete tts; /* Config objects are never deleted (in fact, they are | 954 | delete tts; /* Config objects are never deleted (in fact, they are |
948 | leaked..), so we can't rely on QObject, since that would | 955 | leaked..), so we can't rely on QObject, since that would |
949 | delete the TTSBase instance on application exit */ | 956 | delete the TTSBase instance on application exit */ |
957 | #endif | ||
950 | } | 958 | } |
951 | 959 | ||
952 | void Config::configEnc() | 960 | void Config::configEnc() |
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro index 521728a83f..fb20143397 100644 --- a/rbutil/rbutilqt/rbutilqt.pro +++ b/rbutil/rbutilqt/rbutilqt.pro | |||
@@ -157,7 +157,10 @@ TARGET = RockboxUtility | |||
157 | QT += network | 157 | QT += network |
158 | 158 | ||
159 | message("Qt$$QT_MAJOR_VERSION found") | 159 | message("Qt$$QT_MAJOR_VERSION found") |
160 | QT += widgets multimedia | 160 | QT += widgets |
161 | if (lessThan(QT_MAJOR_VERSION, 6)) { | ||
162 | QT += multimedia | ||
163 | } | ||
161 | 164 | ||
162 | CONFIG += c++11 | 165 | CONFIG += c++11 |
163 | 166 | ||