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

[SofaGuiQt] Qt6 support #1756

Merged
merged 8 commits into from Mar 3, 2021
Merged

Conversation

fredroy
Copy link
Contributor

@fredroy fredroy commented Jan 29, 2021

Preliminary support with the new Qt6 library.

  • Some Qt code/UI files were dated from the Qt4 era, and were using deprecated functions in Qt5 (and removed in Qt6).
  • Qt6 does not support WebEngine and Charts for the moment (?) -> no qdocbrowser, nor chart profiling
  • QGLViewer has not been updated for Qt6 upstream either -> no qtglviewer

Qt5 is still the main version targeted for SOFA, so if CMake finds both Qt5 and Qt6, it will prioritize Qt5.


By submitting this pull request, I acknowledge that
I have read, understand, and agree SOFA Developer Certificate of Origin (DCO).


Reviewers will merge this pull-request only if

  • it builds with SUCCESS for all platforms on the CI.
  • it does not generate new warnings.
  • it does not generate new unit test failures.
  • it does not generate new scene test failures.
  • it does not break API compatibility.
  • it is more than 1 week old (or has fast-merge label).

@fredroy fredroy added pr: status wip Development in the pull-request is still in progress pr: new feature Implement a new feature labels Jan 29, 2021
@fredroy fredroy added pr: status to review To notify reviewers to review this pull-request and removed pr: status wip Development in the pull-request is still in progress labels Feb 2, 2021
@hugtalbot hugtalbot added pr: status ready Approved a pull-request, ready to be squashed and removed pr: status to review To notify reviewers to review this pull-request labels Feb 3, 2021
@guparan
Copy link
Contributor

guparan commented Feb 3, 2021

Not ready yet, give me some time to do a quick clean!

@guparan guparan added pr: status to review To notify reviewers to review this pull-request and removed pr: status ready Approved a pull-request, ready to be squashed labels Feb 3, 2021
@guparan guparan self-assigned this Feb 10, 2021
@damienmarchal
Copy link
Contributor

According to:
https://www.qt.io/blog/add-on-support-in-qt-6.0-and-beyond
Qt 6 will be feature completed for LTS release at version 6.2 which is planned for septembre 2021.
At that time QtChart Qt SerialPort, QtWebEngine, QtDataVisualition will be there.

@guparan guparan added pr: status ready Approved a pull-request, ready to be squashed and removed pr: status to review To notify reviewers to review this pull-request labels Mar 3, 2021
@epernod epernod merged commit 520cbd8 into sofa-framework:master Mar 3, 2021
damienmarchal pushed a commit to CRIStAL-PADR/sofa that referenced this pull request Mar 4, 2021
* make it usable with qt6

* check cmake version

* remove all ref to qt6 in qtglviewer

* [CMake] Improve windeployqt to handle Qt5 and Qt6

* [SofaMacros] Set a variable XXX_HAVE_YYY even if YYY has COMPONENTS

After a find_package(YYY COMPONENTS A B C), XXX_HAVE_YYY will be TRUE if all YYY's COMPONENTS are FOUND.

* [SofaGuiQt] Simplify CMakeLists and make clear that Qt5 is prioritary

* [CMake] FIX duplicated code in windeployqt.cmake

Co-authored-by: Guillaume Paran <guillaume.paran@sofa-framework.org>
@guparan guparan added this to the v21.06 milestone Mar 26, 2021
@fredroy fredroy deleted the compilation_qt6 branch October 14, 2021 10:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr: new feature Implement a new feature pr: status ready Approved a pull-request, ready to be squashed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants