diff options
| author | Jonas Schnelli <jonas.schnelli@include7.ch> | 2015-03-06 09:33:23 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-03-09 11:05:43 +0100 |
| commit | 786cf72c7ff5d4042e7a7d010e96e53b0a597371 (patch) | |
| tree | 03bc98f5d1f7589941db75a5c1985ec8e3efde4e | |
| parent | aeb92792281b4cb9958f3defc9e36f63e65b778a (diff) | |
| download | bitcoin-786cf72c7ff5d4042e7a7d010e96e53b0a597371.tar.xz | |
[Qt] fix a issue where "command line options"-action overwrite "Preference"-action (on OSX)
- fixes #5800
Conflicts:
src/qt/bitcoingui.cpp
Rebased-From: 9bbb880be44dbc378bdd3210eed42eaa77efb774
Github-Pull: #5858
| -rw-r--r-- | src/qt/bitcoingui.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 6a457d361f..1314e0b1c9 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -325,6 +325,7 @@ void BitcoinGUI::createActions(const NetworkStyle *networkStyle) openAction->setStatusTip(tr("Open a bitcoin: URI or payment request")); showHelpMessageAction = new QAction(QApplication::style()->standardIcon(QStyle::SP_MessageBoxInformation), tr("&Command-line options"), this); + showHelpMessageAction->setMenuRole(QAction::NoRole); showHelpMessageAction->setStatusTip(tr("Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options")); connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit())); |