linbo/CmvrControlStation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Qt 5.12 Windows and Linux compatibility

Browse Source
This commit is contained in:
linbo 2026-09-24 15:04:42 +08:00
parent dc4d3b75c7
commit 1473cee798
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/configeditorwidget.cpp
View File

@ -1800,7 +1800,7 @@ bool ConfigEditorWidget::prepareOverviewSave(QString *error)
m_overviewSaveContents.clear(); m_overviewSaveContents.clear();
m_overviewSaveRevisions.clear(); m_overviewSaveRevisions.clear();
for (const QString &path : std::as_const(affectedPaths)) { for (const QString &path : qAsConst(affectedPaths)) {
if (path.isEmpty()) if (path.isEmpty())
continue; continue;
if (!m_overviewContents.contains(path) || !m_overviewRevisions.contains(path)) { if (!m_overviewContents.contains(path) || !m_overviewRevisions.contains(path)) {

10
src/urdfviewerwidget.cpp
View File

@ -32,6 +32,16 @@
#include <Qt3DRender/QScreenRayCaster> #include <Qt3DRender/QScreenRayCaster>
#include <Qt3DRender/QViewport> #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/joint.h>
#include <urdf_model/link.h> #include <urdf_model/link.h>
#include <urdf_model/model.h> #include <urdf_model/model.h>