Fix bitcoin-qt -version output formatting

Summary: > This PR makes command line output of `bitcoin-qt -version` formatted in the same way as `bitcoind -version` output. This is a backport of Core [[bitcoin/bitcoin#14521 | PR14521]] Test Plan: `src/qt/bitcoin-qt -version` Reviewers: #bitcoin_abc, Fabien Reviewed By: #bitcoin_abc, Fabien Differential Revision: https://reviews.bitcoinabc.org/D8352
Bitcoin-ABC · Nov 10, 2020 · e0818f9 · e0818f9
1 parent 7b2fda0
commit e0818f9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
@@ -75,7 +75,7 @@ static bool AppInit(int argc, char *argv[]) {
                                " (" + NETWORK_NAME + " network)\n";
 
         if (gArgs.IsArgSet("-version")) {
-            strUsage += FormatParagraph(LicenseInfo());
+            strUsage += FormatParagraph(LicenseInfo()) + "\n";
         } else {
             strUsage += "\nUsage:  bitcoind [options]                     "
                         "Start " PACKAGE_NAME "\n";

diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp
@@ -16,6 +16,7 @@
 #ifdef ENABLE_BIP70
 #include <qt/paymentrequestplus.h>
 #endif
+#include <util/strencodings.h>
 #include <util/system.h>
 
 #include <QCloseEvent>
@@ -40,9 +41,9 @@ HelpMessageDialog::HelpMessageDialog(interfaces::Node &node, QWidget *parent,
     if (about) {
         setWindowTitle(tr("About %1").arg(PACKAGE_NAME));
 
+        std::string licenseInfo = LicenseInfo();
         /// HTML-format the license message from the core
-        QString licenseInfo = QString::fromStdString(LicenseInfo());
-        QString licenseInfoHTML = licenseInfo;
+        QString licenseInfoHTML = QString::fromStdString(LicenseInfo());
         // Make URLs clickable
         QRegExp uri("<(.*)>", Qt::CaseSensitive, QRegExp::RegExp2);
         uri.setMinimal(true); // use non-greedy matching
@@ -52,7 +53,8 @@ HelpMessageDialog::HelpMessageDialog(interfaces::Node &node, QWidget *parent,
 
         ui->aboutMessage->setTextFormat(Qt::RichText);
         ui->scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
-        text = version + "\n" + licenseInfo;
+        text = version + "\n" +
+               QString::fromStdString(FormatParagraph(licenseInfo));
         ui->aboutMessage->setText(version + "<br><br>" + licenseInfoHTML);
         ui->aboutMessage->setWordWrap(true);
         ui->helpMessage->setVisible(false);