diff options
| author | W. J. van der Laan <laanwj@protonmail.com> | 2021-05-18 22:03:00 +0200 |
|---|---|---|
| committer | W. J. van der Laan <laanwj@protonmail.com> | 2021-05-18 22:03:34 +0200 |
| commit | 2fa3f30050f2db665605c8371b1fd131f39a2f9b (patch) | |
| tree | 2011d2e3349003c8a30fc9e9c05424eb7cc574d7 /src/chainparamsbase.cpp | |
| parent | 1da36b49ab63ff949bd64beea3af12d22e2d2187 (diff) | |
| parent | 33b0b26a03a401bd39b88931b69d162c3c538d31 (diff) | |
Merge bitcoin/bitcoin#21988: doc: note that brew installed qt is not supported
33b0b26a03a401bd39b88931b69d162c3c538d31 doc: note that brew installed qt is not supported (Raul Siles)
Pull request description:
picking up #21791, the author has stated they [cannot squash](https://github.com/bitcoin/bitcoin/pull/21791#issuecomment-828770283).
This is a useful note to prevent any issues from being opened up about this. The reason that both cannot co-exist and build bitcoin is stated [here](https://github.com/bitcoin/bitcoin/pull/21791#issuecomment-837278123):
> ... the reason is sharing /usr/local/include/ and /usr/local/lib/ directories by both qt5 and qt6 installations.
Changes from original PR:
- slightly move the note up in this section, this placement seems more appropriate to me
- drop "Note:"
[PR Render](https://github.com/jarolrod/bitcoin/blob/33b0b26a03a401bd39b88931b69d162c3c538d31/doc/build-osx.md#qt)
ACKs for top commit:
laanwj:
LGTM ACK 33b0b26a03a401bd39b88931b69d162c3c538d31
hebasto:
ACK 33b0b26a03a401bd39b88931b69d162c3c538d31
Tree-SHA512: f9efac1921a7a33b5791a9f9f4bada4b5369d358fc42e9884c077bfb4dc3f273fdd4432ce012006a8009dfafb87e13bddd56c6336fe84b6133f4b22f849c289a
Diffstat (limited to 'src/chainparamsbase.cpp')
0 files changed, 0 insertions, 0 deletions