diff options
author | Lioncash <mathew1800@gmail.com> | 2019-05-19 11:18:13 -0400 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2019-05-19 11:18:16 -0400 |
commit | 7e650088ddd574c7f500eb902a0b80378a1b9b46 (patch) | |
tree | 35413b3458a776be2037928d2e90ed5f01570728 /src | |
parent | 05235ccaa96c26a56a4a3c3af70ec446e785dba7 (diff) |
yuzu/configuration/configure_general: Specify string conversions explicitly
Allows the general configuration code to successfully compile with
implicit string conversions disabled.
Diffstat (limited to 'src')
-rw-r--r-- | src/yuzu/configuration/configure_general.cpp | 3 |
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) 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(); |