diff options
author | bunnei <bunneidev@gmail.com> | 2019-05-20 20:43:28 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-20 20:43:28 -0400 |
commit | dbcff5d574ec879bd2267d18c286708b9239d4bf (patch) | |
tree | bd836d730939d35448ad78a2a05803585e1df92c /src/yuzu/bootmanager.cpp | |
parent | 9a17b20896166b599b22b21cb0057706ad79542a (diff) | |
parent | bc3247490154bdeed40e630c801616e4535b7e0d (diff) |
Merge pull request #2503 from lioncash/util
yuzu/game_list: Specify string conversions explicitly
Diffstat (limited to 'src/yuzu/bootmanager.cpp')
-rw-r--r-- | src/yuzu/bootmanager.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp index 810954b36..c2783d684 100644 --- a/src/yuzu/bootmanager.cpp +++ b/src/yuzu/bootmanager.cpp @@ -188,7 +188,9 @@ private: GRenderWindow::GRenderWindow(QWidget* parent, EmuThread* emu_thread) : QWidget(parent), emu_thread(emu_thread) { setWindowTitle(QStringLiteral("yuzu %1 | %2-%3") - .arg(Common::g_build_name, Common::g_scm_branch, Common::g_scm_desc)); + .arg(QString::fromUtf8(Common::g_build_name), + QString::fromUtf8(Common::g_scm_branch), + QString::fromUtf8(Common::g_scm_desc))); setAttribute(Qt::WA_AcceptTouchEvents); InputCommon::Init(); @@ -217,7 +219,7 @@ void GRenderWindow::SwapBuffers() { // However: // - The Qt debug runtime prints a bogus warning on the console if `makeCurrent` wasn't called // since the last time `swapBuffers` was executed; - // - On macOS, if `makeCurrent` isn't called explicitely, resizing the buffer breaks. + // - On macOS, if `makeCurrent` isn't called explicitly, resizing the buffer breaks. context->makeCurrent(child); context->swapBuffers(child); |