Rockbox open source high quality audio player as a Music Player Daemon
mpris rockbox mpd libadwaita audio rust zig deno
2
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

+12 -1
+8
rbutil/rbutilqt/configure.cpp
··· 20 20 #include <QProgressDialog> 21 21 #include <QFileDialog> 22 22 #include <QUrl> 23 + #ifdef QT_MULTIMEDIA_LIB 23 24 #include <QSound> 25 + #endif 24 26 25 27 #include "version.h" 26 28 #include "configure.h" ··· 446 448 { 447 449 ui.configTTSstatus->setText(tr("Configuration OK")); 448 450 ui.configTTSstatusimg->setPixmap(QPixmap(QString::fromUtf8(":/icons/go-next.png"))); 451 + #ifdef QT_MULTIMEDIA_LIB 449 452 ui.testTTS->setEnabled(true); 453 + #else 454 + ui.testTTS->setEnabled(false); 455 + #endif 450 456 } 451 457 else 452 458 { ··· 895 901 896 902 void Config::testTts() 897 903 { 904 + #ifdef QT_MULTIMEDIA_LIB 898 905 QString errstr; 899 906 int index = ui.comboTts->currentIndex(); 900 907 TTSBase* tts; ··· 947 954 delete tts; /* Config objects are never deleted (in fact, they are 948 955 leaked..), so we can't rely on QObject, since that would 949 956 delete the TTSBase instance on application exit */ 957 + #endif 950 958 } 951 959 952 960 void Config::configEnc()
+4 -1
rbutil/rbutilqt/rbutilqt.pro
··· 157 157 QT += network 158 158 159 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 165 CONFIG += c++11 163 166