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

pull hebasto wants to merge 1 commits into bitcoin:master from hebasto:210602-style changing 3 files +4 −2
  1. hebasto commented at 6:30 pm on June 2, 2021: member

    This PR is similar to 1be8e0f2388e243d310fe7eeb46149a690de4ddf, and, actually, it is a #21376 follow up.

    Required as in Qt 5.12.x style plugins are separated.

    Fixes #22132. Fixes https://github.com/bitcoin-core/gui/issues/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:

    0$ HOSTS=x86_64-w64-mingw32 contrib/guix/guix-build
    1$ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
    2e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  guix-build-ab86ac7739b2/output/dist-archive/SKIPATTEST.TAG
    3d3f05888c95d6cf6f4a0bac952d4c0bf1e271f49cb7ab92b08080b753957e5e5  guix-build-ab86ac7739b2/output/dist-archive/bitcoin-ab86ac7739b2.tar.gz
    4113bb86ffd2854e08d3c0c5cd3f9728f2e4fe6c7a1813bc1c4b73eb48ad6597f  guix-build-ab86ac7739b2/output/x86_64-w64-mingw32/bitcoin-ab86ac7739b2-win-unsigned.tar.gz
    53fdc99754d6f26d9655a308c8847076d8fd4db8d61f4f18d8ef545894a42c10d  guix-build-ab86ac7739b2/output/x86_64-w64-mingw32/bitcoin-ab86ac7739b2-win64-debug.zip
    6932bb69e3eb1a617f9e337b83220c9d6a277bec421f4d78e32dffde5643eb00c  guix-build-ab86ac7739b2/output/x86_64-w64-mingw32/bitcoin-ab86ac7739b2-win64-setup-unsigned.exe
    7852f4c03ad049fcd6bb2ce25b3bcf4e18b90d34f7232660024b341bd7c8dd710  guix-build-ab86ac7739b2/output/x86_64-w64-mingw32/bitcoin-ab86ac7739b2-win64.zip
    8c6a33a193a6b128e665198dde94758acab3a5ab7fefe0c3c6617eb98ad01693d  guix-build-ab86ac7739b2/output/x86_64-w64-mingw32/inputs.SHA256SUMS
    
  2. unknown approved
  3. unknown commented at 7:10 pm on June 2, 2021: none

    ACK https://github.com/bitcoin/bitcoin/pull/22133/commits/da8309ff29f0796e6649f66f2f0e5b402c6e08af

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

    image

    image

    image

    image

  4. DrahtBot added the label GUI on Jun 2, 2021
  5. jarolrod commented at 7:56 pm on June 2, 2021: member

    ACK da8309ff29f0796e6649f66f2f0e5b402c6e08af

    Tested cross-compile from both Arch Linux and Ubuntu, also tested with make deploy.

    Comparison of Debug Logs:

    Master branch:

    02021-06-02T04:16:06Z Qt 5.12.11 (static), plugin=windows (static)
    12021-06-02T04:16:06Z Static plugins:
    22021-06-02T04:16:06Z  QWindowsIntegrationPlugin, version 330752
    32021-06-02T04:16:06Z Style: windows / QWindowsStyle
    

    PR Branch:

    02021-06-02T19:48:25Z Qt 5.12.11 (static), plugin=windows (static)
    12021-06-02T19:48:25Z Static plugins:
    22021-06-02T19:48:25Z  QWindowsIntegrationPlugin, version 330752
    32021-06-02T19:48:25Z  QWindowsVistaStylePlugin, version 330752
    42021-06-02T19:48:25Z Style: windowsvista / QWindowsVistaStyle
    

    Comparison of GUI Visual Style:

    Master PR
    master-cross bitcoin-22133

    < reserved for GUIX hashes >

  6. jarolrod commented at 8:13 pm on June 2, 2021: member

    retracting ACK

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

  7. build, qt: Make QWindowsVistaStylePlugin available again (regression)
    In Qt 5.12.x style plugins are separated.
    
    Co-authored-by: Jarol Rodriguez <jarolrod@tutanota.com>
    ab86ac7739
  8. hebasto force-pushed on Jun 2, 2021
  9. hebasto commented at 9:26 pm on June 2, 2021: member
    MSVC build fixed.
  10. laanwj commented at 7:39 am on June 3, 2021: member
    Concept and code review ACK ab86ac7739b27f2c45ae72ce4c4ebecf324b3e90
  11. hebasto commented at 9:10 am on June 3, 2021: member
    Guix build hashes updated in the OP.
  12. fanquake approved
  13. fanquake commented at 12:39 pm on June 3, 2021: member

    ACK ab86ac7739b27f2c45ae72ce4c4ebecf324b3e90

     0  adding: bitcoin-ab86ac7739b2/bin/test_bitcoin.exe.dbg (deflated 81%)
     1  adding: bitcoin-ab86ac7739b2/lib/libbitcoinconsensus-0.dll.dbg (deflated 78%)
     2
     3real	11m35.180s
     4user	53m25.755s
     5sys	3m55.505s
     6bash-5.1# find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
     7e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  guix-build-ab86ac7739b2/output/dist-archive/SKIPATTEST.TAG
     8d3f05888c95d6cf6f4a0bac952d4c0bf1e271f49cb7ab92b08080b753957e5e5  guix-build-ab86ac7739b2/output/dist-archive/bitcoin-ab86ac7739b2.tar.gz
     9113bb86ffd2854e08d3c0c5cd3f9728f2e4fe6c7a1813bc1c4b73eb48ad6597f  guix-build-ab86ac7739b2/output/x86_64-w64-mingw32/bitcoin-ab86ac7739b2-win-unsigned.tar.gz
    103fdc99754d6f26d9655a308c8847076d8fd4db8d61f4f18d8ef545894a42c10d  guix-build-ab86ac7739b2/output/x86_64-w64-mingw32/bitcoin-ab86ac7739b2-win64-debug.zip
    11932bb69e3eb1a617f9e337b83220c9d6a277bec421f4d78e32dffde5643eb00c  guix-build-ab86ac7739b2/output/x86_64-w64-mingw32/bitcoin-ab86ac7739b2-win64-setup-unsigned.exe
    12852f4c03ad049fcd6bb2ce25b3bcf4e18b90d34f7232660024b341bd7c8dd710  guix-build-ab86ac7739b2/output/x86_64-w64-mingw32/bitcoin-ab86ac7739b2-win64.zip
    13c6a33a193a6b128e665198dde94758acab3a5ab7fefe0c3c6617eb98ad01693d  guix-build-ab86ac7739b2/output/x86_64-w64-mingw32/inputs.SHA256SUMS
    
  14. fanquake merged this on Jun 3, 2021
  15. fanquake closed this on Jun 3, 2021

  16. hebasto deleted the branch on Jun 3, 2021
  17. sidhujag referenced this in commit b4ae44f2a6 on Jun 3, 2021
  18. DeckerSU referenced this in commit 7eecef841c on Nov 15, 2021
  19. TheComputerGenie referenced this in commit b329ee9825 on Jan 5, 2022
  20. gwillen referenced this in commit 9fe08bf392 on Jun 1, 2022
  21. DrahtBot locked this on Aug 16, 2022

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2024-09-28 22:12 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me