diff --git a/rpcs3/rpcs3qt/debugger_frame.cpp b/rpcs3/rpcs3qt/debugger_frame.cpp index 16f8c31b9f..4c39ebd760 100644 --- a/rpcs3/rpcs3qt/debugger_frame.cpp +++ b/rpcs3/rpcs3qt/debugger_frame.cpp @@ -331,7 +331,7 @@ void debugger_frame::UpdateUnitList() const auto on_select = [&](u32, cpu_thread& cpu) { - QVariant var_cpu = qVariantFromValue(&cpu); + QVariant var_cpu = QVariant::fromValue(&cpu); m_choice_units->addItem(qstr(cpu.get_name()), var_cpu); if (old_cpu == var_cpu) m_choice_units->setCurrentIndex(m_choice_units->count() - 1); }; diff --git a/rpcs3/rpcs3qt/emu_settings.cpp b/rpcs3/rpcs3qt/emu_settings.cpp index af80d0b584..dca3f85283 100644 --- a/rpcs3/rpcs3qt/emu_settings.cpp +++ b/rpcs3/rpcs3qt/emu_settings.cpp @@ -503,7 +503,11 @@ void emu_settings::EnhanceSpinBox(QSpinBox* spinbox, SettingsType type, const QS spinbox->setRange(min, max); spinbox->setValue(val); +#if QT_VERSION >= QT_VERSION_CHECK(5,14,0) + connect(spinbox, &QSpinBox::textChanged, [=](const QString&/* text*/) +#else connect(spinbox, QOverload::of(&QSpinBox::valueChanged), [=](const QString&/* value*/) +#endif { SetSetting(type, sstr(spinbox->cleanText())); }); @@ -545,7 +549,11 @@ void emu_settings::EnhanceDoubleSpinBox(QDoubleSpinBox* spinbox, SettingsType ty spinbox->setRange(min, max); spinbox->setValue(val); +#if QT_VERSION >= QT_VERSION_CHECK(5,14,0) + connect(spinbox, &QDoubleSpinBox::textChanged, [=](const QString&/* text*/) +#else connect(spinbox, QOverload::of(&QDoubleSpinBox::valueChanged), [=](const QString&/* value*/) +#endif { SetSetting(type, sstr(spinbox->cleanText())); }); diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp index fc3bbe82fb..abc5552a95 100644 --- a/rpcs3/rpcs3qt/game_list_frame.cpp +++ b/rpcs3/rpcs3qt/game_list_frame.cpp @@ -43,7 +43,7 @@ game_list_frame::game_list_frame(std::shared_ptr guiSettings, std: m_Icon_Color = m_gui_settings->GetValue(gui::gl_iconColor).value(); m_colSortOrder = m_gui_settings->GetValue(gui::gl_sortAsc).toBool() ? Qt::AscendingOrder : Qt::DescendingOrder; m_sortColumn = m_gui_settings->GetValue(gui::gl_sortCol).toInt(); - m_hidden_list = m_gui_settings->GetValue(gui::gl_hidden_list).toStringList().toSet(); + m_hidden_list = gui::utils::list_to_set(m_gui_settings->GetValue(gui::gl_hidden_list).toStringList()); m_oldLayoutIsList = m_isListLayout; @@ -727,7 +727,7 @@ void game_list_frame::Refresh(const bool fromDrive, const bool scrollAfter) // clean up hidden games list m_hidden_list.intersect(serials); - m_gui_settings->SetValue(gui::gl_hidden_list, QStringList(m_hidden_list.toList())); + m_gui_settings->SetValue(gui::gl_hidden_list, QStringList(m_hidden_list.values())); } // Fill Game List / Game Grid @@ -1045,7 +1045,7 @@ void game_list_frame::ShowContextMenu(const QPoint &pos) else m_hidden_list.remove(serial); - m_gui_settings->SetValue(gui::gl_hidden_list, QStringList(m_hidden_list.toList())); + m_gui_settings->SetValue(gui::gl_hidden_list, QStringList(m_hidden_list.values())); Refresh(); }); connect(createPPUCache, &QAction::triggered, [=] diff --git a/rpcs3/rpcs3qt/qt_utils.h b/rpcs3/rpcs3qt/qt_utils.h index fd16d32f0f..ed9b2a45d3 100644 --- a/rpcs3/rpcs3qt/qt_utils.h +++ b/rpcs3/rpcs3qt/qt_utils.h @@ -13,6 +13,16 @@ namespace gui { namespace utils { + template + static QSet list_to_set(const QList& list) + { +#if QT_VERSION >= QT_VERSION_CHECK(5,14,0) + return QSet(list.begin(), list.end()); +#else + return QSet::fromList(list); +#endif + } + // Creates a frame geometry rectangle with given width height that's centered inside the origin, // while still considering screen boundaries. QRect create_centered_window_geometry(const QRect& origin, s32 width, s32 height);