Fix Qt 5.12 Windows and Linux compatibility
This commit is contained in:
parent
dc4d3b75c7
commit
1473cee798
@ -1800,7 +1800,7 @@ bool ConfigEditorWidget::prepareOverviewSave(QString *error)
|
||||
|
||||
m_overviewSaveContents.clear();
|
||||
m_overviewSaveRevisions.clear();
|
||||
for (const QString &path : std::as_const(affectedPaths)) {
|
||||
for (const QString &path : qAsConst(affectedPaths)) {
|
||||
if (path.isEmpty())
|
||||
continue;
|
||||
if (!m_overviewContents.contains(path) || !m_overviewRevisions.contains(path)) {
|
||||
|
||||
@ -32,6 +32,16 @@
|
||||
#include <Qt3DRender/QScreenRayCaster>
|
||||
#include <Qt3DRender/QViewport>
|
||||
|
||||
// Windows headers define legacy near/far macros, while urdfdom uses those
|
||||
// names as Camera data members. Keep the compatibility workaround local to
|
||||
// this translation unit instead of patching the vendored urdfdom headers.
|
||||
#ifdef near
|
||||
#undef near
|
||||
#endif
|
||||
#ifdef far
|
||||
#undef far
|
||||
#endif
|
||||
|
||||
#include <urdf_model/joint.h>
|
||||
#include <urdf_model/link.h>
|
||||
#include <urdf_model/model.h>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user