diff options
| author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2022-04-27 14:34:32 +0200 |
|---|---|---|
| committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2022-04-27 14:50:39 +0200 |
| commit | 0b8e2868f5cb7efb4679da948660f22645a9248e (patch) | |
| tree | d216ec36851aa0b5ead0542b298585206304e799 /src/qt/walletcontroller.cpp | |
| parent | f58c1f1a446716a245ca204e2ac1a219455f1340 (diff) | |
| parent | ab73d5985de5d9c4d1e3fd0f4d9d88a0908ea319 (diff) | |
Merge bitcoin-core/gui#589: Getting ready to Qt 6 (7/n). Do not pass `WalletModel*` to a queued connection
ab73d5985de5d9c4d1e3fd0f4d9d88a0908ea319 Do not pass `WalletModel*` to queued connection (Hennadii Stepanov)
fdf72859504d063d0a6b60a6dac5ad170bd86440 refactor: Make `RPCExecutor*` a member of the `RPCConsole` class (Hennadii Stepanov)
61457c179aec23227dcf3952c575052204103b50 refactor: Guard `RPCConsole::{add,remove}Wallet()` with `ENABLE_WALLET` (Hennadii Stepanov)
Pull request description:
On master (094d9fda5ccee7d78a2e3d8b1eec17b8b6a33466), the following queued connection https://github.com/bitcoin-core/gui/blob/094d9fda5ccee7d78a2e3d8b1eec17b8b6a33466/src/qt/rpcconsole.cpp#L1107 uses a `const WalletModel*` parameter regardless whether the `ENABLE_WALLET` macro is defined.
Although this code works in Qt 5, it is flawed. On Qt 6, the code gets broken because the fully defined `WalletModel` type is required which is not the case if `ENABLE_WALLET` is undefined.
This PR fixes the issue described above.
ACKs for top commit:
promag:
ACK ab73d5985de5d9c4d1e3fd0f4d9d88a0908ea319
jarolrod:
code review ACK https://github.com/bitcoin-core/gui/commit/ab73d5985de5d9c4d1e3fd0f4d9d88a0908ea319
Tree-SHA512: 544ba984da4480aa34f1516a737d6034eb5616b8f78db38dc9bf2d15c15251957bc0b0c9b0d5a365552da9b64a850801a6f4caa12b0ac220f51bd2b334fbe545
Diffstat (limited to 'src/qt/walletcontroller.cpp')
0 files changed, 0 insertions, 0 deletions