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
commit
9bd8ec0193
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
  1. 68
      src/widget/form/settings/aboutform.cpp

68
src/widget/form/settings/aboutform.cpp

@ -57,34 +57,50 @@ 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"
" qTox, please %3 according to the guidelines in our %2"
" wiki article.")
.arg(QString::fromUtf8("<a href=\"https://github.com/tux3/qTox/"
"issues\""
" style=\"text-decoration: underline;"
" color:#0000ff;\">%1</a>")
.arg(tr("bug-tracker"))) .arg(tr("bug-tracker")))
.arg(QString::fromUtf8("<a href=\"https://github.com/tux3/qTox/wiki/Writing-Useful-Bug-Reports\" style=\"text-decoration: underline; color:#0000ff;\">%1</a>") .arg(QString::fromUtf8("<a href=\"https://github.com/tux3/qTox/"
"wiki/Writing-Useful-Bug-Reports\""
" style=\"text-decoration: underline;"
" color:#0000ff;\">%1</a>")
.arg(tr("Writing Useful Bug Reports"))) .arg(tr("Writing Useful Bug Reports")))
.arg(QString::fromUtf8("<a href=\"https://github.com/tux3/qTox/issues/" .arg(QStringLiteral(
"new?body=%23%23%23%23%23+Brief+Description%1A%1AOS%3A+Windows+%2F+" "<a href=\"https://github.com/tux3/qTox/issues"
"OS+X+%2F+Linux+(include+version+and%2For+distro)%1AqTox+version" "/new?body=%23%23%23%23%23+Brief+Description%0A%0AOS"
"%3A+%4%1ACommit+hash%3A+%5%1Atoxcore%3A+%6%1AQt%3A+%7%1A" "%3A+Windows+%2F+OS+X+%2F+Linux+(include+version+and"
"Hardware%3A++%1A%E2%80%A6%1A%1AReproducible%3A+Always+%2F+Almost+" "%2For+distro)%0AqTox+version%3A+") +
"Always+%2F+Sometimes+%2F+Rarely+%2F+Couldn%27t+Reproduce%1A%1A%23" QStringLiteral(GIT_DESCRIBE) +
"%23%23%23%23+Steps+to+reproduce%1A%1A1.+%1A2.+%1A3.+%E2%80%A6%1A" QStringLiteral("%0ACommit+hash%3A+") +
"%1A%23%23%23%23%23+Observed+Behavior%1A%1A%1A%23%23%23%23%23+" QStringLiteral(GIT_VERSION) +
"Expected+Behavior%1A%1A%1A%23%23%23%23%23+Additional+Info%1A(links" QStringLiteral("%0Atoxcore%3A+") + TOXCORE_VERSION +
"%2C+images%2C+etc+go+here)%1A%1A----%1A%1AMore+information+on+how+" QStringLiteral("%0AQt%3A+") +
"to+write+good+bug+reports+in+the+wiki%3A+https%3A%2F%2Fgithub.com" QStringLiteral(QT_VERSION_STR) +
"%2Ftux3%2FqTox%2Fwiki%2FWriting-Useful-Bug-Reports.%1A%1APlease+" QStringLiteral("%0AHardware%3A++%0A%E2%80%A6%0A%0A"
"remove+any+unnecessary+template+section+before+submitting.\" " "Reproducible%3A+Always+%2F+Almost+Always+"
"style=\"text-decoration: underline; color:#0000ff;\">%8</a>") "%2F+Sometimes+%2F+Rarely+%2F+Couldn%27t+"
.arg( "Reproduce%0A%0A%23%23%23%23%23+Steps+to+"
QString("%0"), "reproduce%0A%0A1.+%0A2.+%0A3.+%E2%80%A6"
QString("%2"), "%0A%0A%23%23%23%23%23+Observed+Behavior"
QString("%3"), "%0A%0A%0A%23%23%23%23%23+Expected+Behavior"
QString(GIT_DESCRIBE), "%0A%0A%0A%23%23%23%23%23+Additional+Info"
QString(GIT_VERSION), "%0A(links%2C+images%2C+etc+go+here)%0A%0A"
QString(TOXCORE_VERSION), "----%0A%0AMore+information+on+how+to+"
QString(QT_VERSION_STR), "write+good+bug+reports+in+the+wiki%3A+"
tr("report it"))) "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>")
)
); );
} }

Loading…
Cancel
Save