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.

Sign up for GitHub

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

Jump to bottom

Fix deprecated Qt usage #555

Merged
merged 10 commits into from
Jun 2, 2020
Merged

Fix deprecated Qt usage #555

merged 10 commits into from
Jun 2, 2020

Conversation

jacobperron
Copy link
Member

@jacobperron jacobperron commented Jun 2, 2020 •
edited
Loading

  • Replace obsolete QWheelEvent constructor
  • Replace obsoleted QWheelEvent functions
  • Use QMultiMap for maps storing multiple values with the same key

CI:

  • Linux Build Status
  • Linux-aarch64 Build Status
  • macOS Build Status
  • Windows Build Status

@jacobperron
Fix Qt 5 deprecation warnings
aff31a8 
* Replace obsoleted QWheelEvent functions
* Use QMultiMap for maps storing multiple values with the same key

Signed-off-by: Jacob Perron <jacob@openrobotics.org>
@jacobperron
Update function signature and fix usage of QMultiMap
42abda5 
Signed-off-by: Jacob Perron <jacob@openrobotics.org>
@jacobperron
Stay compatible with Qt versions less than 5.14
7c7ca03 
Signed-off-by: Jacob Perron <jacob@openrobotics.org>
@jacobperron
Use QT_VERSION_CHECK
1c86cbb 
Signed-off-by: Jacob Perron <jacob@openrobotics.org>
@jacobperron
Round from floating point to integer
dae029e 
Signed-off-by: Jacob Perron <jacob@openrobotics.org>
@jacobperron jacobperron requested a review from wjwwood June 2, 2020 17:26
@jacobperron
Use QT_VERSION_CHECK
5fdbbaf 
Signed-off-by: Jacob Perron <jacob@openrobotics.org>
@jacobperron jacobperron added this to In progress in Foxy via automation Jun 2, 2020
@jacobperron jacobperron changed the title Jacob/fix deprecated qt use Fix deprecated Qt usage Jun 2, 2020
@jacobperron
Add missing parentheses
466442c 
Signed-off-by: Jacob Perron <jacob@openrobotics.org>
@jacobperron
Replace obsolete QWheelEvent constructor
ad6aa7a 
Signed-off-by: Jacob Perron <jacob@openrobotics.org>
@jacobperron
Use QPoint for angle delta
53100e7 
Signed-off-by: Jacob Perron <jacob@openrobotics.org>
@jacobperron
Undo whitespace changes
b0e4d74 
Signed-off-by: Jacob Perron <jacob@openrobotics.org>
wjwwood
wjwwood approved these changes Jun 2, 2020
View reviewed changes
Copy link
Member

@wjwwood wjwwood left a comment

Choose a reason for hiding this comment

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

lgtm, I don't see any potential API break here.

rviz_common/src/rviz_common/add_display_dialog.cpp Show resolved Hide resolved
Foxy automation moved this from In progress to Reviewer approved Jun 2, 2020
@wjwwood wjwwood added the bug Something isn't working label Jun 2, 2020
@wjwwood wjwwood merged commit 2eb3d2a into ros2 Jun 2, 2020
Foxy automation moved this from Reviewer approved to Done Jun 2, 2020
@delete-merged-branch delete-merged-branch bot deleted the jacob/fix_deprecated_qt_use branch June 2, 2020 20:04
@jacobperron
Copy link
Member Author

I don't see any potential API break here.

Yeah, you're right. For some reason I thought I also modified a signature in the header 🙃

@cottsay
Copy link
Member

cottsay commented Jun 4, 2020

This broke CentOS 7 builds, which use Qt 5.9.7: Build Status

It isn't likely that we'll see a version bump of Qt5 in CentOS 7 any time soon. If we can't maintain compatibility, I'll need to drop RViz from CentOS packaging.

@dirk-thomas dirk-thomas mentioned this pull request Jun 4, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wjwwood wjwwood wjwwood approved these changes

Assignees

@jacobperron jacobperron

Labels
bug Something isn't working
Projects
No open projects
Foxy
  
Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@jacobperron @cottsay @wjwwood @dirk-thomas