diff options
| author | fanquake <fanquake@gmail.com> | 2021-03-19 16:54:46 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-03-19 16:58:13 +0800 |
| commit | 05757aa860215a8fd5002d99b6ec653175c6b734 (patch) | |
| tree | 80a15ede667bc89a5efe0561638613d095aed2f0 /doc/dependencies.md | |
| parent | 47d79c941abcf79a88c7fe9d5f420fcdd4890c62 (diff) | |
| parent | e67c0122a4e849ec80a75a1d2a7f2465a921b94a (diff) | |
Merge #21423: build: Cleanups and follow ups after bumping Qt to 5.12.10
e67c0122a4e849ec80a75a1d2a7f2465a921b94a doc: Update dependencies.md with a new Qt version (Hennadii Stepanov)
cc25f892d27351e60a8cf7bf5e60b167ebe33201 build: Cleanup libxkbcommon_postprocess_cmds (Hennadii Stepanov)
72fc043954fa39659c572da09e893dc250f2d0f8 build, qt: Drop redundant -lxcb-static flag (Hennadii Stepanov)
cba4a7e4164aa86b00b0f01beaba4be57ae21790 build, qt: Always test plugins/subdir before adding to search paths (Hennadii Stepanov)
Pull request description:
1) Always test `plugins/subdir` before adding to search paths as the existence of each subdir is not guaranteed for all platforms:
- https://github.com/bitcoin/bitcoin/pull/21376#discussion_r591613489
2) Drop redundant `-lxcb-static` flag as it has been already linked with `Qt5XcbQpa`:
- https://github.com/bitcoin/bitcoin/pull/21363#discussion_r588881613
3) Cleanup `libxkbcommon_postprocess_cmds` as there is no `share/` directory in the staging one:
- https://github.com/bitcoin/bitcoin/pull/21376#discussion_r588867355
- https://github.com/bitcoin/bitcoin/pull/21376#issuecomment-794010534
4) Update `dependencies.md`
ACKs for top commit:
fanquake:
ACK e67c0122a4e849ec80a75a1d2a7f2465a921b94a
Tree-SHA512: 9113ee97d5e7424290778154d62a68af804ee82efedbbe9776a7f692104d65b07d151e9f7f1f98ec08d18f6d63efef3e44b207bee67ad913f5dbc4eddbb8ea41
Diffstat (limited to 'doc/dependencies.md')
| -rw-r--r-- | doc/dependencies.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/dependencies.md b/doc/dependencies.md index 31fe68bcd2..1397fe9d0c 100644 --- a/doc/dependencies.md +++ b/doc/dependencies.md @@ -21,7 +21,7 @@ These are the dependencies currently used by Bitcoin Core. You can find instruct | PCRE | | | | | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk) | | Python (tests) | | [3.6](https://www.python.org/downloads) | | | | | qrencode | [3.4.4](https://fukuchi.org/works/qrencode) | | No | | | -| Qt | [5.9.8](https://download.qt.io/official_releases/qt/) | [5.9.5](https://github.com/bitcoin/bitcoin/issues/20104) | No | | | +| Qt | [5.12.10](https://download.qt.io/official_releases/qt/) | [5.9.5](https://github.com/bitcoin/bitcoin/issues/20104) | No | | | | SQLite | [3.32.1](https://sqlite.org/download.html) | [3.7.17](https://github.com/bitcoin/bitcoin/pull/19077) | | | | | XCB | | | | | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk) (Linux only) | | xkbcommon | | | | | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk) (Linux only) | |