pimhwang
/
qTox
mirror of https://github.com/qTox/qTox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #3506 

Nils Fenner (1):
      fix(about-qtox): fix QString "missing argument" warning
pull/3504/head
sudden6 9 years ago
parent
c76d139172 f2f48a8f07
commit
9bd8ec0193
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
1 changed files with 45 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 74
      src/widget/form/settings/aboutform.cpp

74
src/widget/form/settings/aboutform.cpp
Unescape View File

@ -57,35 +57,51 @@ void AboutForm::replaceVersions()
bodyUI->toxCoreVersion->setText(bodyUI->toxCoreVersion->text().replace("$TOXCOREVERSION", TOXCORE_VERSION)); bodyUI->toxCoreVersion->setText(bodyUI->toxCoreVersion->text().replace("$TOXCOREVERSION", TOXCORE_VERSION));
bodyUI->qtVersion->setText(bodyUI->qtVersion->text().replace("$QTVERSION", QT_VERSION_STR)); bodyUI->qtVersion->setText(bodyUI->qtVersion->text().replace("$QTVERSION", QT_VERSION_STR));
bodyUI->knownIssues->setText( bodyUI->knownIssues->setText(
tr("A list of all known issues may be found at our %1 at Github. If you discover a bug or security vulnerability within qTox, please %3 according to the guidelines in our %2 wiki article.") tr("A list of all known issues may be found at our %1 at Github."
.arg(QString::fromUtf8("<a href=\"https://github.com/tux3/qTox/issues\" style=\"text-decoration: underline; color:#0000ff;\">%1</a>") " If you discover a bug or security vulnerability within"
.arg(tr("bug-tracker"))) " qTox, please %3 according to the guidelines in our %2"
.arg(QString::fromUtf8("<a href=\"https://github.com/tux3/qTox/wiki/Writing-Useful-Bug-Reports\" style=\"text-decoration: underline; color:#0000ff;\">%1</a>") " wiki article.")
.arg(tr("Writing Useful Bug Reports"))) .arg(QString::fromUtf8("<a href=\"https://github.com/tux3/qTox/"
.arg(QString::fromUtf8("<a href=\"https://github.com/tux3/qTox/issues/" "issues\""
"new?body=%23%23%23%23%23+Brief+Description%1A%1AOS%3A+Windows+%2F+" " style=\"text-decoration: underline;"
"OS+X+%2F+Linux+(include+version+and%2For+distro)%1AqTox+version" " color:#0000ff;\">%1</a>")
"%3A+%4%1ACommit+hash%3A+%5%1Atoxcore%3A+%6%1AQt%3A+%7%1A" .arg(tr("bug-tracker")))
"Hardware%3A++%1A%E2%80%A6%1A%1AReproducible%3A+Always+%2F+Almost+" .arg(QString::fromUtf8("<a href=\"https://github.com/tux3/qTox/"
"Always+%2F+Sometimes+%2F+Rarely+%2F+Couldn%27t+Reproduce%1A%1A%23" "wiki/Writing-Useful-Bug-Reports\""
"%23%23%23%23+Steps+to+reproduce%1A%1A1.+%1A2.+%1A3.+%E2%80%A6%1A" " style=\"text-decoration: underline;"
"%1A%23%23%23%23%23+Observed+Behavior%1A%1A%1A%23%23%23%23%23+" " color:#0000ff;\">%1</a>")
"Expected+Behavior%1A%1A%1A%23%23%23%23%23+Additional+Info%1A(links" .arg(tr("Writing Useful Bug Reports")))
"%2C+images%2C+etc+go+here)%1A%1A----%1A%1AMore+information+on+how+" .arg(QStringLiteral(
"to+write+good+bug+reports+in+the+wiki%3A+https%3A%2F%2Fgithub.com" "<a href=\"https://github.com/tux3/qTox/issues"
"%2Ftux3%2FqTox%2Fwiki%2FWriting-Useful-Bug-Reports.%1A%1APlease+" "/new?body=%23%23%23%23%23+Brief+Description%0A%0AOS"
"remove+any+unnecessary+template+section+before+submitting.\" " "%3A+Windows+%2F+OS+X+%2F+Linux+(include+version+and"
"style=\"text-decoration: underline; color:#0000ff;\">%8</a>") "%2For+distro)%0AqTox+version%3A+") +
.arg( QStringLiteral(GIT_DESCRIBE) +
QString("%0"), QStringLiteral("%0ACommit+hash%3A+") +
QString("%2"), QStringLiteral(GIT_VERSION) +
QString("%3"), QStringLiteral("%0Atoxcore%3A+") + TOXCORE_VERSION +
QString(GIT_DESCRIBE), QStringLiteral("%0AQt%3A+") +
QString(GIT_VERSION), QStringLiteral(QT_VERSION_STR) +
QString(TOXCORE_VERSION), QStringLiteral("%0AHardware%3A++%0A%E2%80%A6%0A%0A"
QString(QT_VERSION_STR), "Reproducible%3A+Always+%2F+Almost+Always+"
tr("report it"))) "%2F+Sometimes+%2F+Rarely+%2F+Couldn%27t+"
); "Reproduce%0A%0A%23%23%23%23%23+Steps+to+"
"reproduce%0A%0A1.+%0A2.+%0A3.+%E2%80%A6"
"%0A%0A%23%23%23%23%23+Observed+Behavior"
"%0A%0A%0A%23%23%23%23%23+Expected+Behavior"
"%0A%0A%0A%23%23%23%23%23+Additional+Info"
"%0A(links%2C+images%2C+etc+go+here)%0A%0A"
"----%0A%0AMore+information+on+how+to+"
"write+good+bug+reports+in+the+wiki%3A+"
"https%3A%2F%2Fgithub.com%2Ftux3%2FqTox%2F"
"wiki%2FWriting-Useful-Bug-Reports.%0A%0A"
"Please+remove+any+unnecessary+template+"
"section+before+submitting.\""
" style=\"text-decoration: underline;"
" color:#0000ff;\">") + tr("report it") +
QStringLiteral("</a>")
)
);
} }
AboutForm::~AboutForm() AboutForm::~AboutForm()

Write Preview
Loading…
Cancel
Save