-
Notifications
You must be signed in to change notification settings - Fork 25
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
Upgrade to Qt 6 #461
Conversation
src/openstudio_app/CMakeLists.txt
Outdated
# 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) |
There was a problem hiding this comment.
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.
… aqtinstall installer yet
…ionPlugin) I tried to do`set(QT_PROMOTE_TO_GLOBAL_TARGETS ON)` to have them force created but it didn't work
…l libopenstudiolib.so
``` /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' ```
# Conflicts: # FindOpenStudioSDK.cmake # src/model_editor/InspectorGadget.cpp
Merge to master for 1.3.1
@jmarrec I was hoping to get this in in the next week if things look good, is that ok with you? |
@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
Supported platforms: https://www.qt.io/blog/qt6-development-hosts-and-targets
|
@jmarrec I am good to merge this now. Do you want to do any final review or testing on Ubuntu 20.04? |
There was a problem hiding this 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.
.github/workflows/app_build.yml
Outdated
@@ -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 |
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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)
Fixes #438