build, qt: Make QWindowsVistaStylePlugin available again (regression) #22133
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Jun 2, 2021
jarolrod
reviewed
Jun 2, 2021
There was a problem hiding this comment.
ACK da8309f
Tested cross-compile from both Arch Linux and Ubuntu, also tested with make deploy.
Comparison of Debug Logs:
Master branch:
2021-06-02T04:16:06Z Qt 5.12.11 (static), plugin=windows (static)
2021-06-02T04:16:06Z Static plugins:
2021-06-02T04:16:06Z QWindowsIntegrationPlugin, version 330752
2021-06-02T04:16:06Z Style: windows / QWindowsStyle
PR Branch:
2021-06-02T19:48:25Z Qt 5.12.11 (static), plugin=windows (static)
2021-06-02T19:48:25Z Static plugins:
2021-06-02T19:48:25Z QWindowsIntegrationPlugin, version 330752
2021-06-02T19:48:25Z QWindowsVistaStylePlugin, version 330752
2021-06-02T19:48:25Z Style: windowsvista / QWindowsVistaStyle
Comparison of GUI Visual Style:
| Master | PR |
|---|---|
 |
 |
< reserved for GUIX hashes >
|
retracting ACK Will need to update |
In Qt 5.12.x style plugins are separated. Co-authored-by: Jarol Rodriguez <jarolrod@tutanota.com>
|
MSVC build fixed. |
|
Concept and code review ACK ab86ac7 |
|
Guix build hashes updated in the OP. |
fanquake
approved these changes
Jun 3, 2021
There was a problem hiding this comment.
ACK ab86ac7
adding: bitcoin-ab86ac7739b2/bin/test_bitcoin.exe.dbg (deflated 81%)
adding: bitcoin-ab86ac7739b2/lib/libbitcoinconsensus-0.dll.dbg (deflated 78%)
real 11m35.180s
user 53m25.755s
sys 3m55.505s
bash-5.1# find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 guix-build-ab86ac7739b2/output/dist-archive/SKIPATTEST.TAG
d3f05888c95d6cf6f4a0bac952d4c0bf1e271f49cb7ab92b08080b753957e5e5 guix-build-ab86ac7739b2/output/dist-archive/bitcoin-ab86ac7739b2.tar.gz
113bb86ffd2854e08d3c0c5cd3f9728f2e4fe6c7a1813bc1c4b73eb48ad6597f guix-build-ab86ac7739b2/output/x86_64-w64-mingw32/bitcoin-ab86ac7739b2-win-unsigned.tar.gz
3fdc99754d6f26d9655a308c8847076d8fd4db8d61f4f18d8ef545894a42c10d guix-build-ab86ac7739b2/output/x86_64-w64-mingw32/bitcoin-ab86ac7739b2-win64-debug.zip
932bb69e3eb1a617f9e337b83220c9d6a277bec421f4d78e32dffde5643eb00c guix-build-ab86ac7739b2/output/x86_64-w64-mingw32/bitcoin-ab86ac7739b2-win64-setup-unsigned.exe
852f4c03ad049fcd6bb2ce25b3bcf4e18b90d34f7232660024b341bd7c8dd710 guix-build-ab86ac7739b2/output/x86_64-w64-mingw32/bitcoin-ab86ac7739b2-win64.zip
c6a33a193a6b128e665198dde94758acab3a5ab7fefe0c3c6617eb98ad01693d guix-build-ab86ac7739b2/output/x86_64-w64-mingw32/inputs.SHA256SUMS
sidhujag
pushed a commit
to syscoin/syscoin
that referenced
this pull request
Jun 3, 2021
DeckerSU
added a commit
to DeckerSU/KomodoOcean
that referenced
this pull request
Nov 15, 2021
TheComputerGenie
pushed a commit
to TheComputerGenie/KomodoOcean
that referenced
this pull request
Jan 5, 2022
gwillen
pushed a commit
to ElementsProject/elements
that referenced
this pull request
Jun 1, 2022
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is similar to 1be8e0f, and, actually, it is a #21376 follow up.
Required as in Qt 5.12.x style plugins are separated.
Fixes #22132.
Fixes bitcoin-core/gui#303.
Note for reviewers. Besides visual changes in the GUI, you could compare the first dozen of lines in the
debug.logfile.Guix build: