mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-12-13 14:14:00 +01:00
qt: Use | instead of + for key modifiers
This change is preparation for Qt 6 where `+` has been deprecated, and it fixes an experimental build with Qt 6.2.4.
This commit is contained in:
@@ -356,7 +356,7 @@ void BitcoinGUI::createActions()
|
|||||||
showHelpMessageAction->setStatusTip(tr("Show the %1 help message to get a list with possible Bitcoin command-line options").arg(PACKAGE_NAME));
|
showHelpMessageAction->setStatusTip(tr("Show the %1 help message to get a list with possible Bitcoin command-line options").arg(PACKAGE_NAME));
|
||||||
|
|
||||||
m_mask_values_action = new QAction(tr("&Mask values"), this);
|
m_mask_values_action = new QAction(tr("&Mask values"), this);
|
||||||
m_mask_values_action->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_M));
|
m_mask_values_action->setShortcut(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_M));
|
||||||
m_mask_values_action->setStatusTip(tr("Mask the values in the Overview tab"));
|
m_mask_values_action->setStatusTip(tr("Mask the values in the Overview tab"));
|
||||||
m_mask_values_action->setCheckable(true);
|
m_mask_values_action->setCheckable(true);
|
||||||
|
|
||||||
@@ -427,8 +427,8 @@ void BitcoinGUI::createActions()
|
|||||||
}
|
}
|
||||||
#endif // ENABLE_WALLET
|
#endif // ENABLE_WALLET
|
||||||
|
|
||||||
connect(new QShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_C), this), &QShortcut::activated, this, &BitcoinGUI::showDebugWindowActivateConsole);
|
connect(new QShortcut(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_C), this), &QShortcut::activated, this, &BitcoinGUI::showDebugWindowActivateConsole);
|
||||||
connect(new QShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_D), this), &QShortcut::activated, this, &BitcoinGUI::showDebugWindow);
|
connect(new QShortcut(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_D), this), &QShortcut::activated, this, &BitcoinGUI::showDebugWindow);
|
||||||
}
|
}
|
||||||
|
|
||||||
void BitcoinGUI::createMenuBar()
|
void BitcoinGUI::createMenuBar()
|
||||||
|
|||||||
Reference in New Issue
Block a user