Skip to content

Commit fb3a8c0

Browse files
committed
Merge bitcoin-core/gui-qml#487: Use handlers with explicit parameters in main.qml and DesktopWallets.qml
99d5da865466924257daf4d8b59db468992c69e6 Update signal handlers in DesktopWallets.qml to have explicit parameters (johnny9) da6bc7cd97f4c5be66ab77411509fac5a145cde8 Update signal handlers in main.qml to have explicit parameters (johnny9) Pull request description: Signals with parameters should have handlers that explicitly define the arguments. Without this, Qt will throw a warning in the log stating that injection or parameters is deprecated. fixes #481 ACKs for top commit: hebasto: ACK 99d5da865466924257daf4d8b59db468992c69e6, tested on Ubuntu 24.04. Tree-SHA512: 510ab99aeaa8418cc28886452bed28d7cc8c6697286e89d19e4a5cc593dda5f3d07d1e7ca5856be60dc8c6efb50d8e1626ca1a111457dbede6267bf6d1bfe62c
2 parents e90dec4 + f5194b8 commit fb3a8c0

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

qml/pages/main.qml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ ApplicationWindow {
4747
}
4848
anchors.fill: parent
4949
focus: true
50-
Keys.onReleased: {
50+
Keys.onReleased: (event) => {
5151
if (event.key == Qt.Key_Back) {
5252
nodeModel.requestShutdown()
5353
event.accepted = true
@@ -86,7 +86,7 @@ ApplicationWindow {
8686
onAddWallet: {
8787
main.push(createWalletWizard, { "launchContext": CreateWalletWizard.Context.Main })
8888
}
89-
onSendTransaction: {
89+
onSendTransaction: (multipleRecipientsEnabled) => {
9090
if (multipleRecipientsEnabled) {
9191
main.push(multipleSendReviewPage)
9292
} else {

qml/pages/wallet/DesktopWallets.qml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,9 @@ Page {
141141
Activity {
142142
}
143143
Send {
144-
onTransactionPrepared: root.sendTransaction(multipleRecipientsEnabled)
144+
onTransactionPrepared: (multipleRecipientsEnabled) => {
145+
root.sendTransaction(multipleRecipientsEnabled)
146+
}
145147
}
146148
RequestPayment {
147149
}

0 commit comments

Comments
 (0)