qt, build: remove unneeded `Q_IMPORT

theStack commented at 9:18 pm on September 2, 2024: contributor

After the recent full removal of Autotools (PR #30664), these macros are not needed anymore in the .cpp files according to the TODO in qt’s CMakeLists.txt. Tested building on OpenBSD 7.5, where the XCB plugin was still imported according to the debug log:

02024-09-02T21:13:27Z Bitcoin Core version v28.99.0-7346b0109208 (release build)
12024-09-02T21:13:27Z Qt 5.15.12 (dynamic), plugin=xcb
22024-09-02T21:13:27Z No static plugins.
32024-09-02T21:13:27Z Style: fusion / QFusionStyle
42024-09-02T21:13:27Z System: OpenBSD 7.5, x86_64-little_endian-lp64

qt, build: remove unneeded `Q_IMPORT_PLUGIN` macro calls

After the recent full removal of Autotools (PR #30664), these
macros are not needed anymore in the .cpp files according to the
TODO in qt's CMakeLists.txt. Tested building on OpenBSD 7.5, where
the XCB plugin was still imported according to the debug log.

7346b01092

DrahtBot commented at 9:18 pm on September 2, 2024: contributor

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

Reviews

See the guideline for information on the review process.

Type	Reviewers
ACK	hebasto

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

hebasto commented at 9:20 pm on September 2, 2024: member

Concept ACK.

hebasto commented at 9:30 pm on September 2, 2024: member

Tested building on OpenBSD 7.5, where the XCB plugin was still imported according to the debug log:

02024-09-02T21:13:27Z Bitcoin Core version v28.99.0-7346b0109208 (release build)
12024-09-02T21:13:27Z Qt 5.15.12 (dynamic), plugin=xcb
22024-09-02T21:13:27Z No static plugins.
32024-09-02T21:13:27Z Style: fusion / QFusionStyle
42024-09-02T21:13:27Z System: OpenBSD 7.5, x86_64-little_endian-lp64

The log shows “No static plugins.”

To verify that static plugins are still being imported, you should build with depends.

theStack commented at 1:17 pm on September 3, 2024: contributor

The log shows “No static plugins.”

To verify that static plugins are still being imported, you should build with depends.

Tested that on Ubuntu 22.04.3 LTS (since for OpenBSD, depends doesn’t build QT):

02024-09-03T11:47:55Z Bitcoin Core version v28.99.0-7346b0109208 (release build)
12024-09-03T11:47:55Z Qt 5.15.14 (static), plugin=xcb
22024-09-03T11:47:55Z Static plugins:
32024-09-03T11:47:55Z  QMinimalIntegrationPlugin, version 331520
42024-09-03T11:47:55Z  QXcbIntegrationPlugin, version 331520
52024-09-03T11:47:55Z Style: fusion / QFusionStyle
62024-09-03T11:47:55Z System: Ubuntu 22.04.3 LTS, x86_64-little_endian-lp64

hebasto approved

hebasto commented at 1:25 pm on September 5, 2024: member

ACK 7346b0109208c67798bdbd451e509048308eff5d.

Guix-built binaries have been tested on:

Ubuntu 23.10:

02024-09-05T13:22:12Z Bitcoin Core version v28.99.0-g7346b0109208c67798bdbd451e509048308eff5d (release build)
12024-09-05T13:22:12Z Qt 5.15.14 (static), plugin=xcb
22024-09-05T13:22:12Z Static plugins:
32024-09-05T13:22:12Z  QMinimalIntegrationPlugin, version 331520
42024-09-05T13:22:12Z  QXcbIntegrationPlugin, version 331520
52024-09-05T13:22:12Z Style: fusion / QFusionStyle
62024-09-05T13:22:12Z System: Ubuntu 23.10, x86_64-little_endian-lp64

Windows 11 Pro:

02024-09-05T12:51:25Z Bitcoin Core version v28.99.0-g7346b0109208c67798bdbd451e509048308eff5d (release build)
12024-09-05T12:51:25Z Qt 5.15.14 (static), plugin=windows
22024-09-05T12:51:25Z Static plugins:
32024-09-05T12:51:25Z  QWindowsVistaStylePlugin, version 331520
42024-09-05T12:51:25Z  QWindowsIntegrationPlugin, version 331520
52024-09-05T12:51:25Z  QMinimalIntegrationPlugin, version 331520
62024-09-05T12:51:25Z Style: windowsvista / QWindowsVistaStyle
72024-09-05T12:51:25Z System: Windows 11 Version 2009, x86_64-little_endian-llp64

macOS Sonoma 14.6.1 (Apple M1):

02024-09-05T13:16:59Z Bitcoin Core version v28.99.0-g7346b0109208c67798bdbd451e509048308eff5d (release build)
12024-09-05T13:16:59Z Qt 5.15.14 (static), plugin=cocoa
22024-09-05T13:16:59Z Static plugins:
32024-09-05T13:16:59Z  QCocoaIntegrationPlugin, version 331520
42024-09-05T13:16:59Z  QMinimalIntegrationPlugin, version 331520
52024-09-05T13:16:59Z  QMacStylePlugin, version 331520
62024-09-05T13:16:59Z Style: macintosh / QMacStyle
72024-09-05T13:16:59Z System: macOS 14.6, arm64-little_endian-lp64

hebasto merged this on Sep 5, 2024

hebasto closed this on Sep 5, 2024

qt, build: remove unneeded Q_IMPORT_PLUGIN macro calls #834

Reviews

qt, build: remove unneeded `Q_IMPORT_PLUGIN` macro calls #834