diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-11-18 09:35:04 -0500 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-11-18 09:35:07 -0500 |
| commit | 397c6d32c8f8a20a3605ef0d51d159adc21fd125 (patch) | |
| tree | 023dda15033bf1c7c5c4cb5b0b1d69fc0d477cf2 /src | |
| parent | 6fde676f647e3b43cf0f5b242a00896f361ea385 (diff) | |
| parent | e161bc74d24a381c313aecb950d3b8411e0ed19d (diff) | |
| download | bitcoin-397c6d32c8f8a20a3605ef0d51d159adc21fd125.tar.xz | |
Merge #17503: doc: Remove bitness from bitcoin-qt help message and manpage
e161bc74d24a381c313aecb950d3b8411e0ed19d doc: Remove bitness from bitcoin-qt help message and manpage (Wladimir J. van der Laan)
Pull request description:
Remove the `(64-bit)` from the bitcoin-qt help message.
Since removing the Windows 32-bit builds, it is no longer information that is often useful for troubleshooting. This never worked for other architectures than x86, and the only 32-bit x86 build left is the Linux one. Linux users tend to know what architecture they are using.
It also accidentally ends up in the bitcoin-qt manpage (if you happen to be generating them on a x86 machine), which gets checked in. See for example https://github.com/bitcoin/bitcoin/commit/1bc9988993ee84bc814e5a7f33cc90f670a19f6a#diff-e4b84be382c8ea33b83203ceb8c85296
ACKs for top commit:
practicalswift:
ACK e161bc74d24a381c313aecb950d3b8411e0ed19d -- rationale makes sense and diff looks correct :)
MarcoFalke:
Tested ACK e161bc74d24a381c313aecb950d3b8411e0ed19d 🔮
Tree-SHA512: d38754903252896dc86fac6c12ad6615d322c2744db7c02b18574a08c69e8876b2c905e1f09b324002236b111ee93479f89769c562e7b3b2e6eb2992d76464ef
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt/utilitydialog.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp index 095c98d26f..220e41b383 100644 --- a/src/qt/utilitydialog.cpp +++ b/src/qt/utilitydialog.cpp @@ -34,14 +34,6 @@ HelpMessageDialog::HelpMessageDialog(interfaces::Node& node, QWidget *parent, bo ui->setupUi(this); QString version = QString{PACKAGE_NAME} + " " + tr("version") + " " + QString::fromStdString(FormatFullVersion()); - /* On x86 add a bit specifier to the version so that users can distinguish between - * 32 and 64 bit builds. On other architectures, 32/64 bit may be more ambiguous. - */ -#if defined(__x86_64__) - version += " " + tr("(%1-bit)").arg(64); -#elif defined(__i386__ ) - version += " " + tr("(%1-bit)").arg(32); -#endif if (about) { |