This repository has been archived by the owner on Feb 3, 2025. It is now read-only.
Backport qwt 6.2 build fix to gazebo9 #3058
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* IncrementalPlot.cc: include qwt_scale_map.h * Use Qt::MiddleButton to fix deprecation warning * PlotCurve: add private helper for renamed members In qwt 6.2, they have renamed all member variables, so create helper functions to minimize the ifdefs we will need to support both versions. * PlotCurve: add ifdefs to support qwt 6.2.0 Signed-off-by: Steven Peters <scpeters@openrobotics.org>
We currently don't support 2021 and newer, see gazebosim#2867. Signed-off-by: Steven Peters <scpeters@openrobotics.org>
|
I just back-ported #3037 as well |
|
CI looks ok to me |
mjcarroll
approved these changes
Aug 11, 2021
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport #3047 to gazebo9 to fix build:
IncrementalPlot.cc: include qwt_scale_map.h
Use Qt::MiddleButton to fix deprecation warning
PlotCurve: add private helper for renamed members
In qwt 6.2, they have renamed all member variables,
so create helper functions to minimize the ifdefs we will need
to support both versions.
Remember to use Rebase and Merge.