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

Qt6 migrations that are compatible with Qt5 #598

Merged
merged 26 commits into from
Dec 8, 2023
Merged

Conversation

mjcarroll
Copy link
Contributor

Set of qt5+qt6 compatible changes to CMake and remove logic deprecated in qt < 5.15

Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
Base automatically changed from mjcarroll/clazy to main November 13, 2023 23:25
Copy link
Contributor

@iche033 iche033 left a comment

Choose a reason for hiding this comment

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

tested on jammy with qt 5.15, opengl and vulkan on machine without a gpu and this is working fine for me.

As before, I still have issue launching gui with fuel_textured_mesh.sdf world in vulkan. It's an existing issue and not due to changes in this PR.

src/plugins/minimal_scene/MinimalScene.cc Outdated Show resolved Hide resolved
src/plugins/minimal_scene/MinimalScene.hh Outdated Show resolved Hide resolved
src/plugins/minimal_scene/MinimalScene.hh Outdated Show resolved Hide resolved
@mjcarroll mjcarroll self-assigned this Nov 20, 2023
@mjcarroll mjcarroll marked this pull request as draft November 20, 2023 19:32
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
@mjcarroll mjcarroll changed the title Mjcarroll/qt5qt6 Qt6 migrations that are compatible with Qt5 Nov 27, 2023
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
@mjcarroll mjcarroll marked this pull request as ready for review November 27, 2023 20:40
Copy link

codecov bot commented Nov 27, 2023

Codecov Report

Attention: 17 lines in your changes are missing coverage. Please review.

Comparison is base (91b50b8) 70.08% compared to head (dffd3a0) 70.15%.

❗ Current head dffd3a0 differs from pull request most recent head acb224b. Consider uploading reports for the commit acb224b to get more accurate results

Files Patch % Lines
src/plugins/minimal_scene/MinimalSceneRhiVulkan.cc 0.00% 9 Missing ⚠️
src/plugins/minimal_scene/MinimalScene.cc 65.21% 8 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #598      +/-   ##
==========================================
+ Coverage   70.08%   70.15%   +0.07%     
==========================================
  Files          38       38              
  Lines        5348     5345       -3     
==========================================
+ Hits         3748     3750       +2     
+ Misses       1600     1595       -5     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@mjcarroll mjcarroll merged commit 4c86af8 into main Dec 8, 2023
7 checks passed
@mjcarroll mjcarroll deleted the mjcarroll/qt5qt6 branch December 8, 2023 22:56
@mjcarroll mjcarroll mentioned this pull request Jan 29, 2024
14 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants