Skip to content

Implement #22219 changes in the qml/bitcoin.cpp #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 4, 2021

Conversation

hebasto
Copy link
Member

@hebasto hebasto commented Oct 3, 2021

This PR implements bitcoin/bitcoin#22219 changes in the qml/bitcoin.cpp.

@hebasto hebasto changed the title qml: Implement #22219 changes in the qml/bitcoin.cpp Implement #22219 changes in the qml/bitcoin.cpp Oct 3, 2021
jarolrod pushed a commit to jarolrod/gui-qml that referenced this pull request Oct 3, 2021
0d624261ef Merge bitcoin-core/crc32c-subtree#2: Merge upstream
cac7ca830b Merge commit 'fa5ade41ee480003d9c5af6f43567ba22e4e17e6' into bitcoin-fork
fa5ade41ee Fix compilation warnings on ARM64 with old GCC versions. (bitcoin-core#52)
db08d22129 Updated Travis-CI configuration. (bitcoin-core#51)
e31619a5b7 Fix GitHub links. (bitcoin-core#50)
7fa4c263e8 Update Travis CI config. (bitcoin-core#49)
a3d9e6d1a4 Updated third_party/ and Travis CI config. (bitcoin-core#48)

git-subtree-dir: src/crc32c
git-subtree-split: 0d624261ef83ab08c953c196540ed18f355add4c
Copy link
Member

@jarolrod jarolrod left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tACK ef05ff5

tested on macOS 12. Master is currently unable to compile, these changes are needed in order to compile. In regards to the context, the changes performed here are the correct changes to implement #22219.

@hebasto hebasto merged commit f19889f into bitcoin-core:main Oct 4, 2021
@hebasto hebasto deleted the 211003-pr22219 branch October 4, 2021 07:14
jarolrod pushed a commit to jarolrod/gui-qml that referenced this pull request Oct 27, 2021
a44caf65fe Merge bitcoin-core/univalue-subtree#28: Import fixes for sanitizer reported issues
135254331e Import fixes for sanitizer reported issues
d5fb86940e refactor: use c++11 range based for loop in checkObject
ff9c379304 refactor: Use nullptr (c++11) instead of NULL
08a99754d5 build: use ax_cxx_compile_stdcxx.m4 to check for C++11 support
66d3713ce7 Merge bitcoin-core/univalue-subtree#29: ci: travis -> cirrus
808d487292 ci: travis -> cirrus
c390ac375f Merge bitcoin-core/univalue-subtree#19: Split sources for easier buildsystem integration
4a5b0a1c65 build: Move source entries out to sources.mk
6c7d94b33c build: cleanup wonky gen usage
a222637c6d Merge bitcoin-core#23: Merge changes from jgarzik/univalue@1ae6a23
f77d0f718d Merge commit '1ae6a231a0169938eb3972c1d48dd17cba5947e1' into HEAD
1ae6a231a0 Merge pull request bitcoin-core#57 from MarcoFalke/test_fix
92bdd11f0b univalue_write: remove unneeded sstream.h include
ffb621c130 Merge pull request bitcoin-core#56 from drodil/remove_sstream_header
f33acf9fe8 Merge commit '7890db9~' into HEAD
66e0adec4d Remove unnecessary sstream header from univalue.h
88967f6586 Version 1.0.4
1dc113dbef Merge pull request bitcoin-core#50 from luke-jr/pushKV_bool
72392fb227 [tests] test pushKV for boolean values
c23132bcf4 Pushing boolean value to univalue correctly
81faab26a1 Merge pull request bitcoin-core#48 from fwolfst/47-UPDATE_MIT_LINK_TO_HTTPS
b17634ef24 Update URLs to MIT license.
88ab64f6b5 Merge pull request bitcoin-core#46 from jasonbcox/master
35ed96da31 Merge pull request bitcoin-core#44 from MarcoFalke/Mf1709-univalue-cherrypick-explicit
420c226290 Merge pull request bitcoin-core#45 from MarcoFalke/Mf1710-univalue-revert-test

git-subtree-dir: src/univalue
git-subtree-split: a44caf65fe55b9dd8ddb08f04c0f70409efd53b3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants