Fixes #13478
Compiled and lightly tested on 10.14.3 against QT 5.12.0.
Is there an actual benefit to this?
Has anyone done a check for what versions come with current stable distros?
Examples:
Also,
Concept ACK
132 | - [bitcoin_cv_need_acc_widget=no]) 133 | - ]) 134 | - if test "x$bitcoin_cv_need_acc_widget" = xyes; then 135 | - _BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(AccessibleFactory)], [-lqtaccessiblewidgets]) 136 | - fi 137 | + _BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(AccessibleFactory)], [-lqtaccessiblewidgets])
Pretty sure you need to drop this line as well (it's causing the macOS and windows Travis builds to fail: https://travis-ci.org/bitcoin/bitcoin/jobs/492335743#L1641).
Indeed, bitcoin_cv_need_acc_widget would have been xno before.
22 | @@ -23,7 +23,7 @@ These are the dependencies currently used by Bitcoin Core. You can find instruct 23 | | protobuf | [2.6.1](https://github.com/google/protobuf/releases) | | No | | | 24 | | Python (tests) | | [3.4](https://www.python.org/downloads) | | | | 25 | | qrencode | [3.4.4](https://fukuchi.org/works/qrencode) | | No | | | 26 | -| Qt | [5.9.7](https://download.qt.io/official_releases/qt/) | [5.2](https://github.com/bitcoin/bitcoin/pull/14725) | No | | | 27 | +| Qt | [5.9.7](https://download.qt.io/official_releases/qt/) | 5.5.1 | No | | |
Could you (assuming it is merged) link to this PR as a reference? It's useful when referring to the docs to be able to jump straight to the PR/discussion that bumped a dependency.
Concept ACK
26 | @@ -27,9 +27,7 @@ 27 | #include <QTest> 28 | #include <QTextEdit> 29 | #include <QtGlobal> 30 | -#if QT_VERSION >= 0x050000 31 | #include <QtTest/QtTestWidgets>
Could sort includes :-)
257 | @@ -276,7 +258,7 @@ AC_DEFUN([_BITCOIN_QT_CHECK_QT5],[ 258 | #endif 259 | ]], 260 | [[ 261 | - #if QT_VERSION < 0x050200 || QT_VERSION_MAJOR < 5 262 | + #if QT_VERSION < 0x050501 || QT_VERSION_MAJOR < 5
is the QT_VERSION_MAJOR clause still needed? At first glance, it looks like a leftover from when Qt 4 was still supported
I was assuming this is a generic check to see if QT >=5.5.1 is present at all, but haven't tried what happens with older QT versions.
according to https://doc.qt.io/qt-5/qtglobal.html#QT_VERSION if QT_MAJOR_VERSION is 4, then QT_VERSION should be something like 0x040102, so it would already fail the first clause. IOW, I don't think there is any constellation where the first clause is false and the second one is true
Could ask @TheCharlatan if there was a reason to do this in 28482efefb15dc2c273a52b96d1aceb995db4968
I was confused about what the actual supported minor version was at the time. Either way, it is definitely redundant with this pr.
<!--a722867cd34abeea1fadc8d60700f111-->
Gitian builds for commit 0d1160e42185983b398cbc2e2be379002f4a62e9 (master):
b6f4ed89dc83bef8b7aa09f12048fc96... bitcoin-0.17.99-aarch64-linux-gnu-debug.tar.gz3ee773463e92ebe2cfa22652b96fef33... bitcoin-0.17.99-aarch64-linux-gnu.tar.gzb000bfbaa89ff473498fed05fb1f53a1... bitcoin-0.17.99-arm-linux-gnueabihf-debug.tar.gzb4c4330106f5b98bc7e44713e8cc7048... bitcoin-0.17.99-arm-linux-gnueabihf.tar.gze1aa9aa0c0c87b8b4829894a1f7d2330... bitcoin-0.17.99-i686-pc-linux-gnu-debug.tar.gz4cbfe7b2e251c5e9e2c9b7d8cf9a2b49... bitcoin-0.17.99-i686-pc-linux-gnu.tar.gz7319e8babf06a54a32c29efc1da09f95... bitcoin-0.17.99-osx-unsigned.dmg6e76326d1e9f33261f471bb6b2ca6f12... bitcoin-0.17.99-osx64.tar.gz85815000c025fe592fee716fa26dfdd3... bitcoin-0.17.99-riscv64-linux-gnu-debug.tar.gz5007f9268d34f4897d862b30bebd2bdb... bitcoin-0.17.99-riscv64-linux-gnu.tar.gz1f7ece2f1459e7094ccf07af44231d6f... bitcoin-0.17.99-win32-debug.zipfc42a38d8b30fe25028f50e38a5fdc14... bitcoin-0.17.99-win32-setup-unsigned.exe02c79b0e2866328c446df82d5b5da0c7... bitcoin-0.17.99-win32.zip38435a51d583c95f7b1193f692ea5ab7... bitcoin-0.17.99-win64-debug.zip23b80a9a82c105be0a5fbc11b8632338... bitcoin-0.17.99-win64-setup-unsigned.exef332f85e52ce80c672aa90d56305cabd... bitcoin-0.17.99-win64.zip45eb23b08cf0c78191ce654cae935077... bitcoin-0.17.99-x86_64-linux-gnu-debug.tar.gze0e5d1c008da1bb715958b80ba2803f3... bitcoin-0.17.99-x86_64-linux-gnu.tar.gzbcd390e8dc524e9b0e48d32039c453e9... bitcoin-0.17.99.tar.gza9ca4d0b34026b5d5be63bf5b03dad35... bitcoin-linux-0.18-res.yml6d1ab0bfd39d390ecdbd1c89edab394d... bitcoin-linux-build.log0b3d15a873dc02ef3e8823adb6561a77... bitcoin-osx-0.18-res.ymleb49c95d3b0a9d503223ee623bc5f1d3... bitcoin-osx-build.log591f6de26bdedcd2aa867151235254ab... bitcoin-win-0.18-res.yml793b9e0d79dddde9326a5d830b1925a4... bitcoin-win-build.logGitian builds for commit 1dae32ea42ef252b3b4be62858b73afb81adff81 (master and this pull):
93a023b8f70d53e6a961766eeb3c6ad8... bitcoin-0.17.99-aarch64-linux-gnu-debug.tar.gzfc455a93ccbf27871c8a8479083999c9... bitcoin-0.17.99-aarch64-linux-gnu.tar.gz3820ae1a301e1d33d5b39625e8ab0f44... bitcoin-0.17.99-arm-linux-gnueabihf-debug.tar.gz4257e402900a28ee1b74c82877a2c0b2... bitcoin-0.17.99-arm-linux-gnueabihf.tar.gz66484a1f321382f4d5e3e842573158f8... bitcoin-0.17.99-i686-pc-linux-gnu-debug.tar.gzaa583b982528145ca99a54ade8f83b87... bitcoin-0.17.99-i686-pc-linux-gnu.tar.gze112f8aa591f277974282884e6bb18fc... bitcoin-0.17.99-osx-unsigned.dmga1a0dc508fa1dfd030cc624e131cdc60... bitcoin-0.17.99-osx64.tar.gz610f65d201140283a0b1275bd48ea36e... bitcoin-0.17.99-riscv64-linux-gnu-debug.tar.gz392ea15c7b40f386d9829b54117505e5... bitcoin-0.17.99-riscv64-linux-gnu.tar.gzae087a25365e20ed43d992c9c3abdce2... bitcoin-0.17.99-win32-debug.zipb141c2b563c89778a6b859b9475d76cf... bitcoin-0.17.99-win32-setup-unsigned.exe7e88049c5b06d6a7c2cce12954e2fa7a... bitcoin-0.17.99-win32.zipcc0baffba7b76e3a7997dbd8ae4de9c2... bitcoin-0.17.99-win64-debug.zipe4b6c8ddf8591188cb5ae716d3450acb... bitcoin-0.17.99-win64-setup-unsigned.exe7409930ac1be234dc1fe525c3a1a7528... bitcoin-0.17.99-win64.zip2e70116abcf6cbce4a57ac226ac18849... bitcoin-0.17.99-x86_64-linux-gnu-debug.tar.gzfbde4f59a86bac3f85efa59e2c7bad67... bitcoin-0.17.99-x86_64-linux-gnu.tar.gzd9be58ae850a5be3dff62c321e18ee71... bitcoin-0.17.99.tar.gz18ede6dd172b6a1679377643bee9dd50... bitcoin-linux-0.18-res.ymle10078647dc37e1810a002a6db681b76... bitcoin-linux-build.logddd264fa2b733dd5eac705e8484f77c1... bitcoin-osx-0.18-res.yml0516a12b4fe450156378917dc007be10... bitcoin-osx-build.logac0a34fde47d09a2396617e0fff63276... bitcoin-win-0.18-res.yml6f804846c381d2d1a24c1b4ae00028ef... bitcoin-win-build.logAdded release note. The gitian binaries should still be valid.
I removed the redundant || QT_VERSION_MAJOR < 5.
There was a discussion on IRC that debian 8 comes with 5.3 (https://packages.debian.org/jessie/qt5-default)
The conclusion was that anyone on debian 8 should use our ./depends qt package: http://www.erisian.com.au/bitcoin-core-dev/log-2019-02-14.html#l-405
utACK fd46c4c0018c41d36cd892ccb47485b572d65837
utACK fd46c4c0018c41d36cd892ccb47485b572d65837
Ok, I'm late to the party, but we are going to have a release that will not build both on Debian Jessie (QT 5.3.2) and Ubuntu Trusty (QT 5.2.1).
I agree with @jonasschnelli :
<jonasschnelli> "but we need to expect users run it close to the LTS end".
The LTS end date of Ubuntu Trusty is April 2019. The LTS end date of Debian Jessie is June 30, 2020.
IMO we should have a policy not to break compatibility with LTS distributions, unless this is really something we need (i.e. bugs or big issues).
@lucayepa It hasn't been building on those distros before this pull request because no one cared (found it worthwhile) to fix the code
Trusty will be EOL before the final release and if you are on oldstable debian, you can build from depends or use the deterministic binaries.
Milestone
0.18.0