piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3815 from degasus/scm

Browse Source 
SCM: Use std::string.
This commit is contained in:
Matthew Parlane
2016-05-07 20:24:59 +12:00
parent 461a48f8e3 2030ad4577
commit 1e1fce1a03
11 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/DolphinQt2/AboutDialog.cpp
View File

@ -23,10 +23,10 @@ AboutDialog::AboutDialog(QWidget* parent)
text.append(QStringLiteral("<p style='font-size:50pt; font-weight:400; margin-bottom:0px;'>") +
tr("Dolphin") + QStringLiteral("</p>"));
text.append(QStringLiteral("<p style='font-size:18pt; margin-top:0px;'>%1</p>")
.arg(QString::fromUtf8(scm_desc_str)));
.arg(QString::fromUtf8(scm_desc_str.c_str())));
text.append(small + tr("Branch: ") + QString::fromUtf8(scm_branch_str) + QStringLiteral("</p>"));
text.append(small + tr("Revision: ") + QString::fromUtf8(scm_rev_git_str) + QStringLiteral("</p>"));
text.append(small + tr("Branch: ") + QString::fromUtf8(scm_branch_str.c_str()) + QStringLiteral("</p>"));
text.append(small + tr("Revision: ") + QString::fromUtf8(scm_rev_git_str.c_str()) + QStringLiteral("</p>"));
text.append(small + tr("Compiled: ") + QStringLiteral(__DATE__ " " __TIME__ "</p>"));
text.append(medium + tr("Check for updates: ") +