[POC] build: Hello Qt 6 #24798

hebasto · 2022-04-07T14:11:03Z

This is a draft of upgrading Qt in depends up to Qt 6.2 LTS.

The motivation is:

Qt 6 seems (almost) inevitable in the future
this change drops all of the backported patches (but introduces a new one)

Tasks

backport the QTBUG-86080 fix
integrate Qt 6 into build-aux/m4/bitcoin_qt.m4
fix builds which are configured with --disable-wallet
cross-compiling
Guix builds

Closes #20627.

Steps to build on Linux x86_64:

$ make -C depends
$ ./autogen.sh
$ ./configure --with-gui=qt6 CONFIG_SITE=$PWD/depends/x86_64-pc-linux-gnu/share/config.site
$ make clean 
$ make
$ make check

laanwj · 2022-04-07T16:25:10Z

So I understand this doesn't need any actual code changes? Only build system and depends?

hebasto · 2022-04-07T16:51:42Z

So I understand this doesn't need any actual code changes? Only build system and depends?

Cannot say for sure at this point.

DrahtBot · 2022-04-08T07:40:03Z

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

Reviews

See the guideline for information on the review process.
A summary of reviews will appear here.

Conflicts

Reviewers, this pull request conflicts with the following ones:

#25797 (build: Add CMake-based build system by hebasto)
#25391 (guix: Use LTO to build releases by fanquake)
#16545 (refactor: Implement missing error checking for ArgsManager flags by ryanofsky)

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.

laanwj · 2022-04-08T12:45:05Z

Cannot say for sure at this point.

OK I assumed so, as it wouldn't make much sense to change depends if the code cannot handle it. We could try compiling against system Qt6.

hebasto · 2022-04-08T23:52:42Z

Cannot say for sure at this point.

OK I assumed so, as it wouldn't make much sense to change depends if the code cannot handle it. We could try compiling against system Qt6.

Some changes are required: bitcoin-core/gui#577, bitcoin-core/gui#578, bitcoin-core/gui#579, bitcoin-core/gui#580, #24813.

hebasto · 2022-04-09T11:27:09Z

Compiled and linked ~~(not pushed yet)~~:

2022-04-09T11:25:38Z Bitcoin Core version v23.99.0-388ee2edb127 (release build)
2022-04-09T11:25:38Z Qt 6.2.4 (static), plugin=xcb (static)
2022-04-09T11:25:38Z Static plugins:
2022-04-09T11:25:38Z  QXcbIntegrationPlugin, version 393728
2022-04-09T11:25:38Z Style: fusion / QFusionStyle
2022-04-09T11:25:38Z System: Ubuntu Jammy Jellyfish (development branch), x86_64-little_endian-lp64
...

hebasto · 2022-04-09T16:01:07Z

Steps to build this PR in its current state on Linux x86_64:

$ make -C depends
$ ./autogen.sh
$ CONFIG_SITE=$PWD/depends/x86_64-pc-linux-gnu/share/config.site ./configure
$ make clean 
$ make

hebasto · 2022-04-09T17:06:11Z

I ran into a problem while working on this PR.

The problem's root is in two facts:

our build system rely on pkg-config
Qt 6 build system, after switching from qmake to cmake, does not produce *.pc files

The fix suggested in QTBUG-86080 works only for shared libraries.

Here are some ways to work out this problem:

modify Qt's patch to support static builds. Nevertheless, the generated *.pc files lack *.private sections which contains libraries required for static builds. This issue in turn can be solved by adjusting resulted *_LIB variables ad-hoc. Btw, this approach is currently implemented in this PR
develop our own patch which make Qt generate correct *.pc files for static builds (the content of internal QMAKE_PRL_LIBS variables could be used for that)
keep working *.pc files in our repo, and substitute them for static builds
something else
...

jarolrod · 2022-04-10T20:14:59Z

While it's good to think about this kind of integration, I don't know how feasible this will ultimately be.

In d0015fd5f3b0465d2b3f36fda3714e248f1b4c51, you uncomment lines where the patch author intended to return when performing a static build. Here's a link to a discussion on the QTBUG-86080 page where it talks about the current qt internal issues with *.pc files and static builds.

On the surface, it appears we most likely can get this working. But, I worry about the implications of the hacky path we'd take to get there.

laanwj · 2022-04-11T10:42:31Z

IMO for static linking in the release, it's acceptable to carry some hacky patches in depends until the issue gets resolved upstream. I don't have any specific opinion which one, as long as it's works and is maintainable.

I do think we should be able to build against distro Qt6 -dev packages for local builds for development (so without any Qt-side patches). But dynamic-only is fine there. Not sure what the recommended approach to find the libraries is if they don't ship *.pc, though. Probing hardcoded paths is really crappy. Any other autoconf-using Qt6 applications we can borrow scripting from?

luke-jr · 2022-04-12T21:12:13Z

Would prefer to see this PR split between Qt6 compatibility (goal ASAP), and using Qt6 for releases (goal TBD later).

hebasto · 2022-04-12T21:15:20Z

Would prefer to see this PR split between Qt6 compatibility (goal ASAP), and using Qt6 for releases (goal TBD later).

#24798 (comment) -- is it what you mean?

6312575 qt: Update deprecated enum value (Hennadii Stepanov) c7add88 qt: Use `|` instead of `+` for key modifiers (Hennadii Stepanov) 6f1e162 qt: Fix headers (Hennadii Stepanov) Pull request description: For Qt 5 all changes in this PR are refactoring. But for [Qt 6](bitcoin/bitcoin#24798) they are real bugfixes :) As I do not provide anyway way to build `bitcoin-qt` against Qt 6.2.4 fir now, suggesting to reviewers to verify changes for Qt 5 only. ACKs for top commit: shaavan: ACK 6312575 jarolrod: tACK 6312575 Tree-SHA512: ceee983192ddf62f09c1305458af3447ff0e3bd90311fa6328b139673bcaed3407dc0ce0b275028d4e0ca251d6b54dad40b48049211aeb251f65cbb4f5330834

hebasto · 2022-04-12T23:35:58Z

Rebased on top of the bitcoin-core/gui#577.

hebasto · 2022-04-15T10:08:16Z

Rebased on top of the bitcoin-core/gui#579.

d8d99d0 qt6: Do not use deprecated high DPI attributes in Qt 6 (Hennadii Stepanov) 8927bb8 refactor: Fix style in `initTranslations()` function (Hennadii Stepanov) ad73447 qt6: Do not use deprecated `QLibraryInfo::path` in Qt 6 (Hennadii Stepanov) 3f51d0b qt6: Fix type registration (Hennadii Stepanov) Pull request description: One more step in migration to Qt 6. Could be tested with hebasto/bitcoin#3 or bitcoin/bitcoin#24798. No behavior change when compiling with Qt 5. ACKs for top commit: laanwj: Code review ACK d8d99d0 jarolrod: ACK d8d99d0 Tree-SHA512: e5f92a80f8622e5f95dd98a90783956a26d3c8382b9ca8e479fb6c152cfdc85a2f6084e78d463ceea1e0f0b3ac72d2b086c8ca24967b2b6070553317e9e3252e

fanquake · 2022-08-10T11:05:32Z

Can you rebase this to reflect the current state of / remaining changes needed for integration? Seems that some of the changes here have now made it in (via the GUI repo).

hebasto · 2022-08-10T23:01:50Z

Can you rebase this to reflect the current state of / remaining changes needed for integration? Seems that some of the changes here have now made it in (via the GUI repo).

Done 🐅

DrahtBot · 2022-10-04T22:36:25Z

🐙 This pull request conflicts with the target branch and needs rebase.

_{Want to unsubscribe from rebase notifications on this pull request? Just convert this pull request to a "draft".}

fanquake · 2022-12-05T11:37:38Z

Should we close this (for now)? This is blocked on cmake, as we aren't going to introduce a --with-qt6 option, or the other build system changes here. Looks like fb872ed could possibly be PR'd on it's own? Otherwise I'm not sure this is reviewable / that useful to keep open?

DrahtBot added the Build system label Apr 7, 2022

laanwj added the GUI label Apr 7, 2022

This was referenced Apr 8, 2022

Getting ready to Qt 6 (1/n) bitcoin-core/gui#577

Merged

Replace QRegExp with QRegularExpression bitcoin-core/gui#578

Closed

DrahtBot mentioned this pull request Apr 9, 2022

build, qt: Add Wayland support for Linux builds with depends #22708

Closed

hebasto mentioned this pull request Apr 9, 2022

Getting ready to Qt 6 (3/n). Do not use QKeyEvent copy constructor bitcoin-core/gui#580

Merged

DrahtBot mentioned this pull request Apr 9, 2022

build: LLD based macOS toolchain #21778

Merged

hebasto mentioned this pull request Apr 9, 2022

build: Getting ready to Qt 6 (4/n). Improve build-aux/m4/bitcoin_qt.m4 #24813

Closed

hebasto force-pushed the 220406-qt6 branch 2 times, most recently from 8760188 to bf50d5d Compare April 9, 2022 15:59

DrahtBot mentioned this pull request Apr 10, 2022

build: remove use of TARGET_OS and BUILD_OS #23969

Closed

hebasto force-pushed the 220406-qt6 branch from bf50d5d to 2460c71 Compare April 12, 2022 23:32

hebasto mentioned this pull request Apr 13, 2022

Failed assertion during shutdown #23186

Closed

hebasto force-pushed the 220406-qt6 branch from 2460c71 to a7a8492 Compare April 15, 2022 10:07

DrahtBot mentioned this pull request Apr 17, 2022

build, qt: Simplifies checks for -fPIE and -fPIC compatibility #21570

Closed

DrahtBot added the Needs rebase label May 31, 2022

hebasto force-pushed the 220406-qt6 branch from 1b60fe5 to 6398473 Compare May 31, 2022 20:11

DrahtBot removed the Needs rebase label May 31, 2022

DrahtBot mentioned this pull request Jun 1, 2022

ci: Improve "ARM64 Android APK" task #25255

Merged

DrahtBot added the Needs rebase label Jun 2, 2022

hebasto mentioned this pull request Jun 21, 2022

Getting ready to Qt 6 (9/n). Apply Qt 6 specific changes bitcoin-core/gui#623

Merged

hebasto mentioned this pull request Aug 7, 2022

build: Add CMake-based build system #25797

Closed

16 tasks

hebasto force-pushed the 220406-qt6 branch from 6398473 to 34a9e9b Compare August 10, 2022 13:04

DrahtBot removed the Needs rebase label Aug 10, 2022

hebasto force-pushed the 220406-qt6 branch from 34a9e9b to b348a5a Compare August 10, 2022 15:26

hebasto added 7 commits August 10, 2022 19:45

qt6: Fix builds which are configured with --disable-wallet

fb872ed

build: Pass qt_lib_path from depends to the configure script

1c6e80c

build, qt: Integrate DBus flags into QT_{INCLUDES,LIBS}

c38f160

build: Add --with-gui=qt6 configure option

8ce5666

build: Bump Qt up to 6.2.4 LTS

e494e9f

Drop qttools temporarily

ec9ea20

ci: Adjust CI task for Qt 6

e9861ce

hebasto force-pushed the 220406-qt6 branch from b348a5a to e9861ce Compare August 10, 2022 21:36

DrahtBot mentioned this pull request Sep 14, 2022

guix: Use LTO to build releases #25391

Closed

This was referenced Oct 2, 2022

Bump minimum python version to 3.7 #26226

Merged

ci: Allow PIP_PACKAGES on centos #26234

Merged

DrahtBot added the Needs rebase label Oct 4, 2022

hebasto closed this Dec 5, 2022

bitcoin locked and limited conversation to collaborators Dec 5, 2023

hebasto deleted the 220406-qt6 branch October 25, 2024 09:34

[POC] build: Hello Qt 6 #24798

[POC] build: Hello Qt 6 #24798

Uh oh!

Conversation

hebasto commented Apr 7, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

laanwj commented Apr 7, 2022

Uh oh!

hebasto commented Apr 7, 2022

Uh oh!

DrahtBot commented Apr 8, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviews

Conflicts

Uh oh!

laanwj commented Apr 8, 2022

Uh oh!

hebasto commented Apr 8, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hebasto commented Apr 9, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hebasto commented Apr 9, 2022

Uh oh!

hebasto commented Apr 9, 2022

Uh oh!

jarolrod commented Apr 10, 2022

Uh oh!

laanwj commented Apr 11, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

luke-jr commented Apr 12, 2022

Uh oh!

hebasto commented Apr 12, 2022

Uh oh!

hebasto commented Apr 12, 2022

Uh oh!

hebasto commented Apr 15, 2022

Uh oh!

fanquake commented Aug 10, 2022

Uh oh!

hebasto commented Aug 10, 2022

Uh oh!

DrahtBot commented Oct 4, 2022

Uh oh!

fanquake commented Dec 5, 2022

Uh oh!

Uh oh!

hebasto commented Apr 7, 2022 •

edited

Loading

DrahtBot commented Apr 8, 2022 •

edited

Loading

hebasto commented Apr 8, 2022 •

edited

Loading

hebasto commented Apr 9, 2022 •

edited

Loading

laanwj commented Apr 11, 2022 •

edited

Loading