diff options
| author | fanquake <fanquake@gmail.com> | 2021-07-20 11:39:35 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-07-20 11:39:47 +0800 |
| commit | 4fdd0ff9ee90ed855420a883d41451caee10204e (patch) | |
| tree | 878bc82d866092698b32c9152d1a73e55aed43c3 /src | |
| parent | e7441a6a458340daabaccfe0a66eb2ec1e9df0b8 (diff) | |
| parent | 0a5723beea9c909b437e8c3fa434506019c1198c (diff) | |
| download | bitcoin-4fdd0ff9ee90ed855420a883d41451caee10204e.tar.xz | |
Merge bitcoin/bitcoin#22199: macdeploy: minor fixups and simplifications
0a5723beea9c909b437e8c3fa434506019c1198c macdeploy: cleanup .temp.dmg if present (fanquake)
ecffe8689dfbdc33deba8119376dcc8f208f0f72 macdeploy: remove qt4 related code (fanquake)
639f0642539c6b5ba9bc7b39bb8bb52752029bee macdeploy: select the plugins we need, rather than excluding those we don't (fanquake)
3d26b6b9e928e3cdc4b3d8d1f66ec7ed022b411b macdeploy: fix framework printing when passing -verbose (fanquake)
dca6c9032993f2bbf8047751d52f2a5c7ebd3ee4 macdeploy: remove unused plistlib import (fanquake)
Pull request description:
This includes [one followup](https://github.com/bitcoin/bitcoin/pull/20422#discussion_r534207899) and [one bug fix](https://github.com/bitcoin/bitcoin/commit/3d26b6b9e928e3cdc4b3d8d1f66ec7ed022b411b) from #20422, as well as some simplifications to the `macdeployqtplus` code.
ACKs for top commit:
hebasto:
ACK 0a5723beea9c909b437e8c3fa434506019c1198c, tested on macOS Big Sur 11.4 (20F71, x86_64) + Homebrew's Qt 5.15.2.
Tree-SHA512: cfad9505eacd32fe3a9d06eb13b2de0b6d2cad7b17778e90b503501cbf922e53d4e7f7f74952d1aed58410bdae9b0bb3248098583ef5b85689cb27d4dc06c029
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions