diff options
| -rw-r--r-- | src/yuzu/about_dialog.cpp | 7 | ||||
| -rw-r--r-- | src/yuzu/main.cpp | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/yuzu/about_dialog.cpp b/src/yuzu/about_dialog.cpp index e7985c8a7..695b2ef5f 100644 --- a/src/yuzu/about_dialog.cpp +++ b/src/yuzu/about_dialog.cpp | |||
| @@ -11,13 +11,14 @@ | |||
| 11 | AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent), ui(new Ui::AboutDialog) { | 11 | AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent), ui(new Ui::AboutDialog) { |
| 12 | const auto build_id = std::string(Common::g_build_id); | 12 | const auto build_id = std::string(Common::g_build_id); |
| 13 | const auto fmt = std::string(Common::g_title_bar_format_idle); | 13 | const auto fmt = std::string(Common::g_title_bar_format_idle); |
| 14 | const auto yuzuBuildVersion = fmt::format(fmt.empty() ? "yuzu Development Build" : fmt, std::string{}, std::string{}, | 14 | const auto yuzu_build_version = |
| 15 | std::string{}, std::string{}, std::string{}, build_id); | 15 | fmt::format(fmt.empty() ? "yuzu Development Build" : fmt, std::string{}, std::string{}, |
| 16 | std::string{}, std::string{}, std::string{}, build_id); | ||
| 16 | 17 | ||
| 17 | ui->setupUi(this); | 18 | ui->setupUi(this); |
| 18 | ui->labelLogo->setPixmap(QIcon::fromTheme(QStringLiteral("yuzu")).pixmap(200)); | 19 | ui->labelLogo->setPixmap(QIcon::fromTheme(QStringLiteral("yuzu")).pixmap(200)); |
| 19 | ui->labelBuildInfo->setText(ui->labelBuildInfo->text().arg( | 20 | ui->labelBuildInfo->setText(ui->labelBuildInfo->text().arg( |
| 20 | QString::fromStdString(yuzuBuildVersion), QString::fromUtf8(Common::g_scm_branch), | 21 | QString::fromStdString(yuzu_build_version), QString::fromUtf8(Common::g_scm_branch), |
| 21 | QString::fromUtf8(Common::g_scm_desc), QString::fromUtf8(Common::g_build_date).left(10))); | 22 | QString::fromUtf8(Common::g_scm_desc), QString::fromUtf8(Common::g_build_date).left(10))); |
| 22 | } | 23 | } |
| 23 | 24 | ||
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 5cefb5d72..1717e06f9 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp | |||
| @@ -207,11 +207,11 @@ GMainWindow::GMainWindow() | |||
| 207 | 207 | ||
| 208 | const auto build_id = std::string(Common::g_build_id); | 208 | const auto build_id = std::string(Common::g_build_id); |
| 209 | const auto fmt = std::string(Common::g_title_bar_format_idle); | 209 | const auto fmt = std::string(Common::g_title_bar_format_idle); |
| 210 | const auto yuzuBuildVersion = | 210 | const auto yuzu_build_version = |
| 211 | fmt::format(fmt.empty() ? "yuzu Development Build" : fmt, std::string{}, std::string{}, | 211 | fmt::format(fmt.empty() ? "yuzu Development Build" : fmt, std::string{}, std::string{}, |
| 212 | std::string{}, std::string{}, std::string{}, build_id); | 212 | std::string{}, std::string{}, std::string{}, build_id); |
| 213 | 213 | ||
| 214 | LOG_INFO(Frontend, "yuzu Version: {} | {}-{}", yuzuBuildVersion, Common::g_scm_branch, | 214 | LOG_INFO(Frontend, "yuzu Version: {} | {}-{}", yuzu_build_version, Common::g_scm_branch, |
| 215 | Common::g_scm_desc); | 215 | Common::g_scm_desc); |
| 216 | #ifdef ARCHITECTURE_x86_64 | 216 | #ifdef ARCHITECTURE_x86_64 |
| 217 | LOG_INFO(Frontend, "Host CPU: {}", Common::GetCPUCaps().cpu_string); | 217 | LOG_INFO(Frontend, "Host CPU: {}", Common::GetCPUCaps().cpu_string); |