Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Qt 6 #461

Merged
merged 45 commits into from
Apr 8, 2022
Merged

Upgrade to Qt 6 #461

merged 45 commits into from
Apr 8, 2022

Conversation

macumber
Copy link
Collaborator

Fixes #438

Comment on lines 383 to 388
# TODO: We used to run fixup_bundle on all plaforms before on 5.15.0...
# On Ubuntu, I get: `# CMake Error at /usr/share/cmake-3.21/Modules/BundleUtilities.cmake:997 (message): error: fixup_bundle: not a valid bundle`
if(APPLE)
# This does some "magic" **including on Linux** (cf #345) (On linux it will install in ./bin/ the libopenstudio.so, and libicu* stuff)
Copy link
Collaborator

Choose a reason for hiding this comment

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

This concerns me a little, but we'll see.

src/openstudio_app/CMakeLists.txt Outdated Show resolved Hide resolved
```
 /usr/bin/ld: warning: libEGL.so.1, needed by Qt-install/6.2.1/gcc_64/lib/libQt6Gui.so.6.2.1, not found (try using -rpath or -rpath-link)
/usr/bin/ld: Qt-install/6.2.1/gcc_64/lib/libQt6Gui.so.6.2.1: undefined reference to `eglGetCurrentContext'
/usr/bin/ld: Qt-install/6.2.1/gcc_64/lib/libQt6Gui.so.6.2.1: undefined reference to `eglQueryString'
/usr/bin/ld: Qt-install/6.2.1/gcc_64/lib/libQt6Gui.so.6.2.1: undefined reference to `eglGetProcAddress'
/usr/bin/ld: Qt-install/6.2.1/gcc_64/lib/libQt6Gui.so.6.2.1: undefined reference to `eglGetConfigAttrib'
/usr/bin/ld: Qt-install/6.2.1/gcc_64/lib/libQt6Gui.so.6.2.1: undefined reference to `eglGetError'
```
@macumber
Copy link
Collaborator Author

@jmarrec I was hoping to get this in in the next week if things look good, is that ok with you?

@jmarrec
Copy link
Collaborator

jmarrec commented Mar 14, 2022

@macumber Sure. But do note that it means dropping 18.04 support, as Qt 6 doesn't support it. Or build it from source, which is a PITA.

https://doc.qt.io/qt-6/supported-platforms.html#availability-of-packages

Linux binary packages are linked against glibc 2.28. If you are using a glibc version older than that you need to build Qt from sources or upgrade glibc to 2.28 or newer.

Supported platforms: https://www.qt.io/blog/qt6-development-hosts-and-targets

    Windows 10 2004 (64bit Intel; msvc2019 or mingw81/gcc8.1)
    macOS 10.15 (64bit Intel; XCode 11)
    Linux:
        Ubuntu 20.04 (64bit Intel; gcc9)
        CentOS 8.1 (64bit Intel; gcc9)
        SLES 15 (SUSE Linux Enterprise Server, 64bit Intel; gcc10)
        Open SUSE 15.1 (64bit; gcc9)

@macumber macumber dismissed jmarrec’s stale review March 19, 2022 21:35

Incorporated changes

@macumber
Copy link
Collaborator Author

@jmarrec I am good to merge this now. Do you want to do any final review or testing on Ubuntu 20.04?

@macumber macumber requested a review from jmarrec March 20, 2022 03:47
Copy link
Collaborator

@jmarrec jmarrec left a comment

Choose a reason for hiding this comment

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

Assuming CI comes clean, we'll merge this one. We can bump to Qt 6.3.0 when it comes out.

@@ -28,36 +28,22 @@ env:
CPACK_SOURCE_TXZ: OFF
CPACK_SOURCE_TZ: OFF
CPACK_SOURCE_ZIP: OFF
QT_VERSION: 5.15.0
QT_VERSION: 6.2.3
Copy link
Collaborator

Choose a reason for hiding this comment

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

Qt 6.2.4 was released on march 18th. 250 bug fixes, binary compatibility. It's worth bumping IMHO.

As a patch release, Qt 6.2.4 does not add any new functionality but provides
bug fixes and other improvements and maintains both forward and backward
compatibility (source and binary) with Qt 6.2.3.

https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.2.4/release-note.md

Copy link
Collaborator

Choose a reason for hiding this comment

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

Qt 6.3.0 is planned in 4 days (original: 16.03.2022 , updated: 12.04.2022)

@jmarrec jmarrec added this to the OpenStudio Application 1.4.0 milestone Apr 8, 2022
@jmarrec jmarrec merged commit 7078341 into develop Apr 8, 2022
@jmarrec jmarrec deleted the 438_qt_6 branch April 8, 2022 10:37
@github-actions github-actions bot locked and limited conversation to collaborators Apr 8, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update to Qt 6.2
2 participants