From 7e650088ddd574c7f500eb902a0b80378a1b9b46 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 19 May 2019 11:18:13 -0400 Subject: [PATCH] yuzu/configuration/configure_general: Specify string conversions explicitly Allows the general configuration code to successfully compile with implicit string conversions disabled. --- src/yuzu/configuration/configure_general.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/yuzu/configuration/configure_general.cpp b/src/yuzu/configuration/configure_general.cpp index e48f4f5a3..dd25dc6e1 100644 --- a/src/yuzu/configuration/configure_general.cpp +++ b/src/yuzu/configuration/configure_general.cpp @@ -14,7 +14,8 @@ ConfigureGeneral::ConfigureGeneral(QWidget* parent) ui->setupUi(this); for (const auto& theme : UISettings::themes) { - ui->theme_combobox->addItem(theme.first, theme.second); + ui->theme_combobox->addItem(QString::fromUtf8(theme.first), + QString::fromUtf8(theme.second)); } this->setConfiguration();