Skip to content

build, qt: Make QWindowsVistaStylePlugin available again (regression)#22133

Merged
fanquake merged 1 commit intobitcoin:masterfrom
hebasto:210602-style
Jun 3, 2021
Merged

build, qt: Make QWindowsVistaStylePlugin available again (regression)#22133
fanquake merged 1 commit intobitcoin:masterfrom
hebasto:210602-style

Conversation

@hebasto
Copy link
Member

@hebasto hebasto commented Jun 2, 2021 •
edited
Loading

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.log file.

Guix build:

$ HOSTS=x86_64-w64-mingw32 contrib/guix/guix-build
$ 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

This was referenced Jun 2, 2021
Closed
Closed
Closed
ghost
ghost approved these changes Jun 2, 2021
View reviewed changes
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

ACK da8309f

Difference that is easier to notice: Color of progress bar 🟧(Master) and 🟩(PR)

Master Branch

image

image

PR Branch

image

image

@DrahtBot DrahtBot added the GUI label Jun 2, 2021
jarolrod
jarolrod reviewed Jun 2, 2021
View reviewed changes
Copy link
Contributor

@jarolrod jarolrod left a comment •
edited
Loading

Choose a reason for hiding this comment

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

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
master-cross bitcoin-22133

< reserved for GUIX hashes >

@jarolrod
Copy link
Contributor

jarolrod commented Jun 2, 2021

retracting ACK

Will need to update build_msvc -> https://ci.appveyor.com/project/DrahtBot/bitcoin/builds/39434710#L31

@hebasto @jarolrod
build, qt: Make QWindowsVistaStylePlugin available again (regression)
ab86ac7 
In Qt 5.12.x style plugins are separated.

Co-authored-by: Jarol Rodriguez <[email protected]>
@hebasto
Copy link
Member Author

hebasto commented Jun 2, 2021

MSVC build fixed.

@laanwj
Copy link
Member

laanwj commented Jun 3, 2021

Concept and code review ACK ab86ac7

@hebasto
Copy link
Member Author

hebasto commented Jun 3, 2021

Guix build hashes updated in the OP.

fanquake
fanquake approved these changes Jun 3, 2021
View reviewed changes
Copy link
Member

@fanquake fanquake left a comment

Choose a reason for hiding this comment

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

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

@fanquake fanquake merged commit 6fe012c into bitcoin:master Jun 3, 2021
@hebasto hebasto deleted the 210602-style branch June 3, 2021 13:29
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Jun 3, 2021
@fanquake
Merge bitcoin#22133: build, qt: Make QWindowsVistaStylePlugin availab…
b4ae44f 
…le agai…
DeckerSU added a commit to DeckerSU/KomodoOcean that referenced this pull request Nov 15, 2021
@DeckerSU
build, qt: Make QWindowsVistaStylePlugin available again
7eecef8 
(c) bitcoin/bitcoin#22133

Fixes:

- bitcoin/bitcoin#22132
- bitcoin-core/gui#303
TheComputerGenie pushed a commit to TheComputerGenie/KomodoOcean that referenced this pull request Jan 5, 2022
@DeckerSU
build, qt: Make QWindowsVistaStylePlugin available again
b329ee9 
(c) bitcoin/bitcoin#22133

Fixes:

- bitcoin/bitcoin#22132
- bitcoin-core/gui#303
gwillen pushed a commit to ElementsProject/elements that referenced this pull request Jun 1, 2022
@apoelstra
Merge 6fe012c into merged_master (Bitcoin PR bitcoin/bitcoin#22133)
9fe08bf
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Aug 16, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@fanquake fanquake fanquake approved these changes

+2 more reviewers

@jarolrod jarolrod jarolrod left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

GUI

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Missing windowsvista style plugin for Windows Remove indented/raised borders elements on Windows

5 participants

@hebasto @jarolrod @laanwj @fanquake @DrahtBot