qt, build: Drop `QT_STATICPLUGIN` macro

hebasto commented at 1:08 pm on August 1, 2024: member

Broken out of #30454.

Our QT_STATICPLUGIN macro is effectively equivalent to the Qt’s QT_STATIC macro.

It is easy to see in the _BITCOIN_QT_IS_STATIC macro implementation: https://github.com/bitcoin/bitcoin/blob/ebd82fa9fae13d5a7a395800295dd7fd34185b58/build-aux/m4/bitcoin_qt.m4#L269-L292

No need to handle both macros.

qt, build: Drop `QT_STATICPLUGIN` macro

Our `QT_STATICPLUGIN` macro is effectively equivalent to the Qt's
`QT_STATIC` macro. No need to handle both of them.

b3d3ae0680

hebasto added the label GUI on Aug 1, 2024

hebasto added the label Build system on Aug 1, 2024

DrahtBot commented at 1:08 pm on August 1, 2024: contributor

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Code Coverage

For detailed information about the code coverage, see the test coverage report.

Reviews

See the guideline for information on the review process.

Type	Reviewers
ACK	maflcko, TheCharlatan

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

Conflicts

Reviewers, this pull request conflicts with the following ones:

#30454 (build: Introduce CMake-based build system by hebasto)
#29790 ([DO NOT MERGE] cmake: Migrate CI scripts to CMake-based build system – WIP by hebasto)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

hebasto commented at 1:11 pm on August 1, 2024: member

cc @laanwj @luke-jr

in src/qt/guiutil.cpp:919 in b3d3ae0680 outdated

920-    const std::string plugin_link{"static"};
921-#else
922-    const std::string plugin_link{"dynamic"};
923-#endif
924-    LogPrintf("Qt %s (%s), plugin=%s (%s)\n", qVersion(), qt_link, QGuiApplication::platformName().toStdString(), plugin_link);
925+    LogPrintf("Qt %s (%s), plugin=%s\n", qVersion(), qt_link, QGuiApplication::platformName().toStdString());

maflcko commented at 1:26 pm on August 1, 2024:

nit: While touching this line, could use LogInfo instead of the less clear/deprecated LogPrintf? (also below)

(feel free to ignore the style nit)

hebasto commented at 1:45 pm on August 1, 2024:

I’ve pushed another commit.

maflcko approved

maflcko commented at 1:29 pm on August 1, 2024: member

review ACK b3d3ae0680e7529853413de045aa9fbd7ac51e5c

qt: Replace deprecated LogPrintf with LogInfo in GUIUtil::LogQtInfo() 7231c7630e

maflcko commented at 1:48 pm on August 1, 2024: member

re-ACK 7231c7630e61c062440459963f7b00ccbec68f0f

maflcko added the label DrahtBot Guix build requested on Aug 1, 2024

maflcko commented at 3:27 pm on August 1, 2024: member

(tested locally as well now)

hebasto commented at 3:56 pm on August 1, 2024: member

My Guix build:

 0x86_64
 198407549aa3669941d4a62769347b8856e7ced674d4d1eb585a90c18515ca7d5  guix-build-7231c7630e61/output/aarch64-linux-gnu/SHA256SUMS.part
 2f17aafc69621bed4d3e56709ece95335c94815d73e1979aa6a9e791aa9aa9a64  guix-build-7231c7630e61/output/aarch64-linux-gnu/bitcoin-7231c7630e61-aarch64-linux-gnu-debug.tar.gz
 31d6220fe4f217d51cdf0b957955cd81722452fd777431ccdb09ce0154f8f7571  guix-build-7231c7630e61/output/aarch64-linux-gnu/bitcoin-7231c7630e61-aarch64-linux-gnu.tar.gz
 480a808d56607fd60711a094779d23e7ead04f3cd0935acc177d31f896a8aed73  guix-build-7231c7630e61/output/arm-linux-gnueabihf/SHA256SUMS.part
 57e0103a26c1a669493136329e15a1caa1b4f64e2e5c9e2c7250bf835a2b5a812  guix-build-7231c7630e61/output/arm-linux-gnueabihf/bitcoin-7231c7630e61-arm-linux-gnueabihf-debug.tar.gz
 6677722316243ebaa40926e4c3ddc8adccc155e44b42ba3e2cd158883304a6644  guix-build-7231c7630e61/output/arm-linux-gnueabihf/bitcoin-7231c7630e61-arm-linux-gnueabihf.tar.gz
 788dff4b12ba1c06cac3b55f9239beca9212e6a1233be571cb18a8ad131ccca3b  guix-build-7231c7630e61/output/arm64-apple-darwin/SHA256SUMS.part
 81d760883d2e2f6fa7fef4a7f393663cdc3132741eb4d01956eca1442aafbca99  guix-build-7231c7630e61/output/arm64-apple-darwin/bitcoin-7231c7630e61-arm64-apple-darwin-unsigned.tar.gz
 98c657f37eebd67d654aecf2f0640b1ef7657cd88bd96a74800df058b6706c06a  guix-build-7231c7630e61/output/arm64-apple-darwin/bitcoin-7231c7630e61-arm64-apple-darwin-unsigned.zip
108a3ecb4fee92af6fd0e1a27985b9e1e8c4c9e7e3eab594b948a84804640f6365  guix-build-7231c7630e61/output/arm64-apple-darwin/bitcoin-7231c7630e61-arm64-apple-darwin.tar.gz
11b74932a3b166a159efd56603aa52a6ac889ceccd04c63e59710345cdf2326082  guix-build-7231c7630e61/output/dist-archive/bitcoin-7231c7630e61.tar.gz
123aa0db280d42bf182a8d6622656b89bee2ca0121176d9e90befcab9d48783315  guix-build-7231c7630e61/output/powerpc64-linux-gnu/SHA256SUMS.part
13f6efff379c562fe1100ee3d4eadafbacf37ed1f907c385dab46182fd490857ef  guix-build-7231c7630e61/output/powerpc64-linux-gnu/bitcoin-7231c7630e61-powerpc64-linux-gnu-debug.tar.gz
14d6fa2ac36503ab01f1280f5a1f6fac988717b400bdceaea84aa8608464708d1f  guix-build-7231c7630e61/output/powerpc64-linux-gnu/bitcoin-7231c7630e61-powerpc64-linux-gnu.tar.gz
15ccf553dabded595863ab6c2d899b81943551cd904bdf08f626a2bc5365e41404  guix-build-7231c7630e61/output/riscv64-linux-gnu/SHA256SUMS.part
1607cff8e4f0476479aeb0aaae4214834f95b3bc20aa7902c6a03a1838a1b01549  guix-build-7231c7630e61/output/riscv64-linux-gnu/bitcoin-7231c7630e61-riscv64-linux-gnu-debug.tar.gz
17013a972ce5bdeb5802b05c005c37a7365f4dfd514b67779b9f708192f449eb9d  guix-build-7231c7630e61/output/riscv64-linux-gnu/bitcoin-7231c7630e61-riscv64-linux-gnu.tar.gz
18e0156ead9ffd0fce29649fe68295eca4a3f7ec95b753c4e26a35dee6d59a67c0  guix-build-7231c7630e61/output/x86_64-apple-darwin/SHA256SUMS.part
192bcc482044a5fa96db56b51db63b76c00802d05c11ae11a8c1365205bef6b258  guix-build-7231c7630e61/output/x86_64-apple-darwin/bitcoin-7231c7630e61-x86_64-apple-darwin-unsigned.tar.gz
2093bdd5d622d9914ba1a08e952ee48aba8b48843352f754d99534a9bdfa4109cc  guix-build-7231c7630e61/output/x86_64-apple-darwin/bitcoin-7231c7630e61-x86_64-apple-darwin-unsigned.zip
21f311530be17042ee36bf7ea215ee79e441e73357a5f6a8ff7c8564652d2b9ca9  guix-build-7231c7630e61/output/x86_64-apple-darwin/bitcoin-7231c7630e61-x86_64-apple-darwin.tar.gz
2239b961b92c9d15fb1c5cb5be2f41f0ab990399a905a62dcb0c1240d4e29e2cc1  guix-build-7231c7630e61/output/x86_64-linux-gnu/SHA256SUMS.part
2324c1645e2625be01229d365c70406141bfd13a693562fe92db5dddba63ccc38e  guix-build-7231c7630e61/output/x86_64-linux-gnu/bitcoin-7231c7630e61-x86_64-linux-gnu-debug.tar.gz
2410c3a2ea87c096d264b8337705a791859d101b79c00124d1ae5e3dd8d5a14b9d  guix-build-7231c7630e61/output/x86_64-linux-gnu/bitcoin-7231c7630e61-x86_64-linux-gnu.tar.gz
25e88e2f38462f5500b5623fec66c44431d34c88f2848b8f8ac12aed59d382557e  guix-build-7231c7630e61/output/x86_64-w64-mingw32/SHA256SUMS.part
267422bfff3571437c771bada908a3d720d59ce19914d1240ed1deb6a14142d2c3  guix-build-7231c7630e61/output/x86_64-w64-mingw32/bitcoin-7231c7630e61-win64-debug.zip
2766d0748078935ade01d5a3fee3b53e95b1ff2ffd72559fd73d44568e6eeef6ea  guix-build-7231c7630e61/output/x86_64-w64-mingw32/bitcoin-7231c7630e61-win64-setup-unsigned.exe
28ed9f2f061281db9c58d715e4334f57a80534ce600844238527c6cc882f63aa09  guix-build-7231c7630e61/output/x86_64-w64-mingw32/bitcoin-7231c7630e61-win64-unsigned.tar.gz
290367ac404c119e2f1b1ef95e5197425b743af6fc0d81d757917cef50cd9a9e0b  guix-build-7231c7630e61/output/x86_64-w64-mingw32/bitcoin-7231c7630e61-win64.zip

TheCharlatan commented at 8:06 pm on August 1, 2024: contributor

Guix builds (aarch64):

 098407549aa3669941d4a62769347b8856e7ced674d4d1eb585a90c18515ca7d5  guix-build-7231c7630e61/output/aarch64-linux-gnu/SHA256SUMS.part
 1f17aafc69621bed4d3e56709ece95335c94815d73e1979aa6a9e791aa9aa9a64  guix-build-7231c7630e61/output/aarch64-linux-gnu/bitcoin-7231c7630e61-aarch64-linux-gnu-debug.tar.gz
 21d6220fe4f217d51cdf0b957955cd81722452fd777431ccdb09ce0154f8f7571  guix-build-7231c7630e61/output/aarch64-linux-gnu/bitcoin-7231c7630e61-aarch64-linux-gnu.tar.gz
 380a808d56607fd60711a094779d23e7ead04f3cd0935acc177d31f896a8aed73  guix-build-7231c7630e61/output/arm-linux-gnueabihf/SHA256SUMS.part
 47e0103a26c1a669493136329e15a1caa1b4f64e2e5c9e2c7250bf835a2b5a812  guix-build-7231c7630e61/output/arm-linux-gnueabihf/bitcoin-7231c7630e61-arm-linux-gnueabihf-debug.tar.gz
 5677722316243ebaa40926e4c3ddc8adccc155e44b42ba3e2cd158883304a6644  guix-build-7231c7630e61/output/arm-linux-gnueabihf/bitcoin-7231c7630e61-arm-linux-gnueabihf.tar.gz
 688dff4b12ba1c06cac3b55f9239beca9212e6a1233be571cb18a8ad131ccca3b  guix-build-7231c7630e61/output/arm64-apple-darwin/SHA256SUMS.part
 71d760883d2e2f6fa7fef4a7f393663cdc3132741eb4d01956eca1442aafbca99  guix-build-7231c7630e61/output/arm64-apple-darwin/bitcoin-7231c7630e61-arm64-apple-darwin-unsigned.tar.gz
 88c657f37eebd67d654aecf2f0640b1ef7657cd88bd96a74800df058b6706c06a  guix-build-7231c7630e61/output/arm64-apple-darwin/bitcoin-7231c7630e61-arm64-apple-darwin-unsigned.zip
 98a3ecb4fee92af6fd0e1a27985b9e1e8c4c9e7e3eab594b948a84804640f6365  guix-build-7231c7630e61/output/arm64-apple-darwin/bitcoin-7231c7630e61-arm64-apple-darwin.tar.gz
10b74932a3b166a159efd56603aa52a6ac889ceccd04c63e59710345cdf2326082  guix-build-7231c7630e61/output/dist-archive/bitcoin-7231c7630e61.tar.gz
113aa0db280d42bf182a8d6622656b89bee2ca0121176d9e90befcab9d48783315  guix-build-7231c7630e61/output/powerpc64-linux-gnu/SHA256SUMS.part
12f6efff379c562fe1100ee3d4eadafbacf37ed1f907c385dab46182fd490857ef  guix-build-7231c7630e61/output/powerpc64-linux-gnu/bitcoin-7231c7630e61-powerpc64-linux-gnu-debug.tar.gz
13d6fa2ac36503ab01f1280f5a1f6fac988717b400bdceaea84aa8608464708d1f  guix-build-7231c7630e61/output/powerpc64-linux-gnu/bitcoin-7231c7630e61-powerpc64-linux-gnu.tar.gz
14ccf553dabded595863ab6c2d899b81943551cd904bdf08f626a2bc5365e41404  guix-build-7231c7630e61/output/riscv64-linux-gnu/SHA256SUMS.part
1507cff8e4f0476479aeb0aaae4214834f95b3bc20aa7902c6a03a1838a1b01549  guix-build-7231c7630e61/output/riscv64-linux-gnu/bitcoin-7231c7630e61-riscv64-linux-gnu-debug.tar.gz
16013a972ce5bdeb5802b05c005c37a7365f4dfd514b67779b9f708192f449eb9d  guix-build-7231c7630e61/output/riscv64-linux-gnu/bitcoin-7231c7630e61-riscv64-linux-gnu.tar.gz
17e0156ead9ffd0fce29649fe68295eca4a3f7ec95b753c4e26a35dee6d59a67c0  guix-build-7231c7630e61/output/x86_64-apple-darwin/SHA256SUMS.part
182bcc482044a5fa96db56b51db63b76c00802d05c11ae11a8c1365205bef6b258  guix-build-7231c7630e61/output/x86_64-apple-darwin/bitcoin-7231c7630e61-x86_64-apple-darwin-unsigned.tar.gz
1993bdd5d622d9914ba1a08e952ee48aba8b48843352f754d99534a9bdfa4109cc  guix-build-7231c7630e61/output/x86_64-apple-darwin/bitcoin-7231c7630e61-x86_64-apple-darwin-unsigned.zip
20f311530be17042ee36bf7ea215ee79e441e73357a5f6a8ff7c8564652d2b9ca9  guix-build-7231c7630e61/output/x86_64-apple-darwin/bitcoin-7231c7630e61-x86_64-apple-darwin.tar.gz
2139b961b92c9d15fb1c5cb5be2f41f0ab990399a905a62dcb0c1240d4e29e2cc1  guix-build-7231c7630e61/output/x86_64-linux-gnu/SHA256SUMS.part
2224c1645e2625be01229d365c70406141bfd13a693562fe92db5dddba63ccc38e  guix-build-7231c7630e61/output/x86_64-linux-gnu/bitcoin-7231c7630e61-x86_64-linux-gnu-debug.tar.gz
2310c3a2ea87c096d264b8337705a791859d101b79c00124d1ae5e3dd8d5a14b9d  guix-build-7231c7630e61/output/x86_64-linux-gnu/bitcoin-7231c7630e61-x86_64-linux-gnu.tar.gz
24e88e2f38462f5500b5623fec66c44431d34c88f2848b8f8ac12aed59d382557e  guix-build-7231c7630e61/output/x86_64-w64-mingw32/SHA256SUMS.part
257422bfff3571437c771bada908a3d720d59ce19914d1240ed1deb6a14142d2c3  guix-build-7231c7630e61/output/x86_64-w64-mingw32/bitcoin-7231c7630e61-win64-debug.zip
2666d0748078935ade01d5a3fee3b53e95b1ff2ffd72559fd73d44568e6eeef6ea  guix-build-7231c7630e61/output/x86_64-w64-mingw32/bitcoin-7231c7630e61-win64-setup-unsigned.exe
27ed9f2f061281db9c58d715e4334f57a80534ce600844238527c6cc882f63aa09  guix-build-7231c7630e61/output/x86_64-w64-mingw32/bitcoin-7231c7630e61-win64-unsigned.tar.gz
280367ac404c119e2f1b1ef95e5197425b743af6fc0d81d757917cef50cd9a9e0b  guix-build-7231c7630e61/output/x86_64-w64-mingw32/bitcoin-7231c7630e61-win64.zip

TheCharlatan approved

TheCharlatan commented at 8:13 pm on August 1, 2024: contributor

ACK 7231c7630e61c062440459963f7b00ccbec68f0f

Tested bitcoin-qt on macos 12.7.4

DrahtBot commented at 10:40 pm on August 1, 2024: contributor

Guix builds (on x86_64) [untrusted test-only build, possibly unsafe, not for production use]

File	commit ebd82fa9fae13d5a7a395800295dd7fd34185b58(master)	commit 67521f6547838a85fb5dde2e51bb08692d0e1fe9(master and this pull)
SHA256SUMS.part	`db3ae8d087560a64...`	`db9e1f398516aaeb...`
*-aarch64-linux-gnu-debug.tar.gz	`ef5e2e7ae211acb9...`	`fe1e8411c4696fae...`
*-aarch64-linux-gnu.tar.gz	`960ed693f9e14508...`	`e58153d33b2d6e37...`
*-arm-linux-gnueabihf-debug.tar.gz	`01ffc465a0a022da...`	`48eb467cf0d4f66b...`
*-arm-linux-gnueabihf.tar.gz	`425ca63094f3f84b...`	`d2db2b1a4b9d14ca...`
*-arm64-apple-darwin-unsigned.tar.gz	`c0e778ab80bb5cb5...`	`654831ed89f3a69e...`
*-arm64-apple-darwin-unsigned.zip	`0fd1c08c9697b8f7...`	`457307d5dce70725...`
*-arm64-apple-darwin.tar.gz	`92a51ea5a48aabd9...`	`5c6e81cc5bf2d614...`
*-powerpc64-linux-gnu-debug.tar.gz	`dcc22b4262959413...`	`bfa006507184d4e2...`
*-powerpc64-linux-gnu.tar.gz	`7f1d58595fb7c82c...`	`02f558819a59ac66...`
*-riscv64-linux-gnu-debug.tar.gz	`6614e93465c63ea5...`	`3d4d0c3399f0c366...`
*-riscv64-linux-gnu.tar.gz	`ceeefe0ed07c5dff...`	`876e5d045e1df94e...`
*-x86_64-apple-darwin-unsigned.tar.gz	`903d089539518158...`	`fe846ae33f0849d6...`
*-x86_64-apple-darwin-unsigned.zip	`a178966ce73ab7d0...`	`05f7bb789907cf31...`
*-x86_64-apple-darwin.tar.gz	`1d5f08726a08b701...`	`8b2c1903176ee298...`
*-x86_64-linux-gnu-debug.tar.gz	`bb5455922c310049...`	`d3a1da147f388d47...`
*-x86_64-linux-gnu.tar.gz	`b07dcc980947572d...`	`89442fecad7df8c6...`
*.tar.gz	`7c7b88765eb3697e...`	`8a0c1f4ec2d3092c...`
guix_build.log	`b2568af4000fcafe...`	`c16a5c59df9f171f...`
guix_build.log.diff		`8cdc1a42787ab763...`

DrahtBot removed the label DrahtBot Guix build requested on Aug 1, 2024

fanquake merged this on Aug 2, 2024

fanquake closed this on Aug 2, 2024

hebasto deleted the branch on Aug 2, 2024

qt, build: Drop QT_STATICPLUGIN macro #30567

Code Coverage

Reviews

Conflicts

Guix builds (on x86_64) [untrusted test-only build, possibly unsafe, not for production use]

qt, build: Drop `QT_STATICPLUGIN` macro #30567