diff options
| author | fanquake <fanquake@gmail.com> | 2021-10-07 08:37:58 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-10-07 08:39:52 +0800 |
| commit | a68de12c0ebfaa9a1dd7f347c7a3aff0e07ae9b9 (patch) | |
| tree | 814336ec0928a50d6d928bc874b294c9bb5add28 /.cirrus.yml | |
| parent | 577b0ffd2ea408e08e9fdecffc3b64933a8fc467 (diff) | |
| parent | 6bc43989372386bf1dc6ee2a763a46a2d0780059 (diff) | |
| download | bitcoin-a68de12c0ebfaa9a1dd7f347c7a3aff0e07ae9b9.tar.xz | |
Merge bitcoin/bitcoin#22890: doc: Replace a link to Qt precompiled binaries with compile instructions
6bc43989372386bf1dc6ee2a763a46a2d0780059 doc: Suggest using jom instead of nmake (Hennadii Stepanov)
c4139f06a943edc38e3b02980fbe7aa4ed794374 doc: Replace a link to Qt precompiled binaries with compile instructions (Hennadii Stepanov)
5e42f2ad26d35950405480f3eea2ed73fdfba841 build: Make <QtBaseDir> default name Qt and VS versions agnostic (Hennadii Stepanov)
Pull request description:
This PR replaces a [link to Qt precompiled binaries](https://github.com/sipsorcery/qt_win_binary/releases) with compile instructions that allow users to self-compile static Qt package which is required for building Bitcoin Core with Visual Studio.
ACKs for top commit:
sipsorcery:
ACK 6bc43989372386bf1dc6ee2a763a46a2d0780059.
Tree-SHA512: 0c91536e51177ec2ed437614cb37b3fd1dccce856548c22307359da68200433971fd97cd8a537b0856cfccc521ac50d61801a78cb5275b818829ee7b43bc7d6a
Diffstat (limited to '.cirrus.yml')
| -rw-r--r-- | .cirrus.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 48747ac138..5491f2c04b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -90,7 +90,7 @@ task: QT_DOWNLOAD_URL: 'https://download.qt.io/official_releases/qt/5.12/5.12.11/single/qt-everywhere-src-5.12.11.zip' QT_LOCAL_PATH: 'C:\qt-everywhere-src-5.12.11.zip' QT_SOURCE_DIR: 'C:\qt-everywhere-src-5.12.11' - QTBASEDIR: 'C:\Qt5.12.11_x64_static_vs2019_160900' + QTBASEDIR: 'C:\Qt_static' x64_NATIVE_TOOLS: '"C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat"' IgnoreWarnIntDirInTempDetected: 'true' merge_script: |