summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Lioncash2019-05-19 11:18:13 -0400
committerGravatar Lioncash2019-05-19 11:18:16 -0400
commit7e650088ddd574c7f500eb902a0b80378a1b9b46 (patch)
tree35413b3458a776be2037928d2e90ed5f01570728
parentyuzu/configuration/configure_gamelist: Specify string conversions explicitly (diff)
downloadyuzu-7e650088ddd574c7f500eb902a0b80378a1b9b46.tar.gz
yuzu-7e650088ddd574c7f500eb902a0b80378a1b9b46.tar.xz
yuzu-7e650088ddd574c7f500eb902a0b80378a1b9b46.zip
yuzu/configuration/configure_general: Specify string conversions explicitly
Allows the general configuration code to successfully compile with implicit string conversions disabled.
-rw-r--r--src/yuzu/configuration/configure_general.cpp3
1 files changed, 2 insertions, 1 deletions
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)
14 ui->setupUi(this); 14 ui->setupUi(this);
15 15
16 for (const auto& theme : UISettings::themes) { 16 for (const auto& theme : UISettings::themes) {
17 ui->theme_combobox->addItem(theme.first, theme.second); 17 ui->theme_combobox->addItem(QString::fromUtf8(theme.first),
18 QString::fromUtf8(theme.second));
18 } 19 }
19 20
20 this->setConfiguration(); 21 this->setConfiguration();