dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop Qt 5 support

Browse Source 
Qt 6 has been available for almost 4 years. Qt 5 is no longer officially supported by Qt for opensource, it's time to drop Qt 5.
This commit is contained in:
Jonas Kvinge
2024-09-07 00:12:56 +02:00
parent eb30c654c5
commit e3e6a22172
91 changed files with 76 additions and 760 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/settings/backendsettingspage.cpp
View File

@@ -449,13 +449,7 @@ void BackendSettingsPage::Load_Device(const QString &output, const QVariant &dev
}
// This allows a custom ALSA device string ie: "hw:0,0" even if it is not listed.
if (engine()->CustomDeviceSupport(output) &&
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
device.metaType().id() == QMetaType::QString
#else
device.type() == QVariant::String
#endif
&& !device.toString().isEmpty()) {
if (engine()->CustomDeviceSupport(output) && device.metaType().id() == QMetaType::QString && !device.toString().isEmpty()) {
ui_->lineedit_device->setText(device.toString());
if (!found) {
for (int i = 0; i < ui_->combobox_device->count(); ++i) {
@@ -600,11 +594,7 @@ void BackendSettingsPage::DeviceSelectionChanged(int index) {
if (engine()->CustomDeviceSupport(output.name)) {
ui_->lineedit_device->setEnabled(true);
if (ui_->combobox_device->currentText() != QLatin1String(kOutputCustom)) {
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
if (device.metaType().id() == QMetaType::QString)
#else
if (device.type() == QVariant::String)
#endif
ui_->lineedit_device->setText(device.toString());
else ui_->lineedit_device->clear();
}
@@ -644,11 +634,7 @@ void BackendSettingsPage::DeviceStringChanged() {
for (int i = 0; i < ui_->combobox_device->count(); ++i) {
QVariant device = ui_->combobox_device->itemData(i).value<QVariant>();
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
if (device.metaType().id() != QMetaType::QString) continue;
#else
if (device.type() != QVariant::String) continue;
#endif
QString device_str = device.toString();
if (device_str.isEmpty()) continue;
if (ui_->combobox_device->itemText(i) == QLatin1String(kOutputCustom)) continue;
@@ -831,11 +817,7 @@ void BackendSettingsPage::SelectDevice(const QString &device_new) {
QListView *view = qobject_cast<QListView*>(ui_->combobox_device->view());
if (view && view->isRowHidden(i)) continue;
QVariant device = ui_->combobox_device->itemData(i).value<QVariant>();
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
if (device.metaType().id() != QMetaType::QString) continue;
#else
if (device.type() != QVariant::String) continue;
#endif
QString device_str = device.toString();
if (device_str.isEmpty()) continue;
if (device_str == device_new) {

11
src/settings/collectionsettingspage.cpp
View File

@@ -171,12 +171,7 @@ void CollectionSettingsPage::Load() {
ui_->checkbox_overwrite_playcount->setChecked(s.value("overwrite_playcount", false).toBool());
ui_->checkbox_overwrite_rating->setChecked(s.value("overwrite_rating", false).toBool());
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
ui_->checkbox_delete_files->setChecked(s.value("delete_files", false).toBool());
#else
ui_->checkbox_delete_files->setChecked(false);
ui_->checkbox_delete_files->hide();
#endif
s.endGroup();
@@ -208,11 +203,7 @@ void CollectionSettingsPage::Save() {
QString filter_text = ui_->cover_art_patterns->text();
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
QStringList filters = filter_text.split(QLatin1Char(','), Qt::SkipEmptyParts);
#else
QStringList filters = filter_text.split(QLatin1Char(','), QString::SkipEmptyParts);
#endif
const QStringList filters = filter_text.split(QLatin1Char(','), Qt::SkipEmptyParts);
s.setValue("cover_art_patterns", filters);

5
src/settings/playlistsettingspage.cpp
View File

@@ -95,12 +95,7 @@ void PlaylistSettingsPage::Load() {
ui_->checkbox_editmetadatainline->setChecked(s.value("editmetadatainline", false).toBool());
ui_->checkbox_writemetadata->setChecked(s.value("write_metadata", false).toBool());
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
ui_->checkbox_delete_files->setChecked(s.value("delete_files", false).toBool());
#else
ui_->checkbox_delete_files->setChecked(false);
ui_->checkbox_delete_files->hide();
#endif
s.endGroup();

4
src/settings/subsonicsettingspage.cpp
View File

@@ -60,11 +60,7 @@ SubsonicSettingsPage::SubsonicSettingsPage(SettingsDialog *dialog, QWidget *pare
dialog->installEventFilter(this);
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
ui_->checkbox_http2->show();
#else
ui_->checkbox_http2->hide();
#endif
}