diff --git a/ui/drivers/qt/qt_dialogs.cpp b/ui/drivers/qt/qt_dialogs.cpp index 8231d2bdb9..db2f96b1a9 100644 --- a/ui/drivers/qt/qt_dialogs.cpp +++ b/ui/drivers/qt/qt_dialogs.cpp @@ -1197,12 +1197,7 @@ void CoreOptionsDialog::buildLayout() } for (k = 0; k < option->vals->size; k++) -#if (QT_VERSION > QT_VERSION_CHECK(6, 0, 0)) - combo_box->addItem(option->vals->elems[k].data, QVariant::fromValue(option->key)); -#else - combo_box->addItem(option->vals->elems[k].data, option->key); -#endif - + combo_box->addItem(option->vals->elems[k].data, QVariant::fromValue(QString(option->key))); combo_box->setCurrentText(val); combo_box->setProperty("default_index", diff --git a/ui/drivers/ui_qt.cpp b/ui/drivers/ui_qt.cpp index 46ed069f70..0a67fec8db 100644 --- a/ui/drivers/ui_qt.cpp +++ b/ui/drivers/ui_qt.cpp @@ -3111,13 +3111,8 @@ void MainWindow::setCoreActions() if (!found_existing) { QVariantMap comboBoxMap; -#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) - comboBoxMap["core_name"] = QVariant::fromValue(coreInfo->core_name); - comboBoxMap["core_path"] = QVariant::fromValue(coreInfo->path); -#else - comboBoxMap["core_name"] = coreInfo->core_name; - comboBoxMap["core_path"] = coreInfo->path; -#endif + comboBoxMap["core_name"] = QVariant::fromValue(QString(coreInfo->core_name)); + comboBoxMap["core_path"] = QVariant::fromValue(QString(coreInfo->path)); comboBoxMap["core_selection"] = CORE_SELECTION_PLAYLIST_DEFAULT; m_launchWithComboBox->addItem(coreInfo->core_name, QVariant::fromValue(comboBoxMap)); }