diff options
| author | fanquake <fanquake@gmail.com> | 2020-08-24 10:05:51 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2020-08-24 12:14:18 +0800 |
| commit | 38c13a4a6055c0e5af37475fbaae8e41ae26b64f (patch) | |
| tree | 5ff0d418ffc460a4be52b31c9c102246352ae180 /configure.ac | |
| parent | 197450f80868fe752c6107955e5da80704212b34 (diff) | |
| parent | 4af4672525f698c7b491023fcd36a17a4e982070 (diff) | |
| download | bitcoin-38c13a4a6055c0e5af37475fbaae8e41ae26b64f.tar.xz | |
Merge #19689: build: Add Qt version checking
4af4672525f698c7b491023fcd36a17a4e982070 build, qt: Add Qt version checking (Hennadii Stepanov)
30e336f785e1b662cade3cfacea91a9785ea1023 build: Drop unused bitcoin_cv_qt58 (Hennadii Stepanov)
Pull request description:
Now `configure` script checks that Qt version is not less then minimum required (currently [5.5.1](https://github.com/bitcoin/bitcoin/pull/15393)).
This PR is an alternative to #15706 (see https://github.com/bitcoin/bitcoin/pull/15706#issuecomment-629076962).
Closes #15688.
The first commit removes dead code (see https://github.com/bitcoin/bitcoin/pull/18297#issuecomment-603252662).
ACKs for top commit:
fanquake:
ACK 4af4672525f698c7b491023fcd36a17a4e982070 - this looks ok. I've tested this with Qt 5.15.0 and Qt 5.7.1 system libs, as well as 5.9.8 from depends.
Tree-SHA512: 8e3b82fa3a98926814923331038185633fabad962c271f31bd158e1ab293dcde52ab1dbf997745540a9ed27e16835cf5b5f3701d405876d877fa561eb03cc619
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 3ab97eb531..edb4ef0dc8 100644 --- a/configure.ac +++ b/configure.ac @@ -1161,7 +1161,7 @@ else BITCOIN_QT_INIT dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus - BITCOIN_QT_CONFIGURE + BITCOIN_QT_CONFIGURE([5.5.1]) fi if test x$enable_wallet != xno; then |