|
| 1 | +diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 2 | +index a220b3a..ae44a55 100644 |
| 3 | +--- a/CMakeLists.txt |
| 4 | ++++ b/CMakeLists.txt |
| 5 | +@@ -19,10 +19,10 @@ find_package(rviz_ogre_vendor REQUIRED) |
| 6 | + add_definitions(-DBOOST_MATH_DISABLE_FLOAT128) |
| 7 | + |
| 8 | + # Qt Stuff |
| 9 | +-find_package(Qt5 REQUIRED COMPONENTS Core Widgets) |
| 10 | +-set(QT_LIBRARIES Qt5::Widgets) |
| 11 | ++find_package(Qt6 REQUIRED COMPONENTS Core Widgets) |
| 12 | ++set(QT_LIBRARIES Qt6::Widgets) |
| 13 | + macro(qt_wrap_ui) |
| 14 | +- qt5_wrap_ui(${ARGN}) |
| 15 | ++ qt6_wrap_ui(${ARGN}) |
| 16 | + endmacro() |
| 17 | + |
| 18 | + set(CMAKE_INCLUDE_CURRENT_DIR ON) |
| 19 | +diff --git a/motion_planning_tasks/src/remote_task_model.cpp b/motion_planning_tasks/src/remote_task_model.cpp |
| 20 | +index d28cfd6..8926cba 100644 |
| 21 | +--- a/motion_planning_tasks/src/remote_task_model.cpp |
| 22 | ++++ b/motion_planning_tasks/src/remote_task_model.cpp |
| 23 | +@@ -526,7 +526,7 @@ QVariant RemoteSolutionModel::data(const QModelIndex& index, int role) const { |
| 24 | + return item.creation_rank; |
| 25 | + case 1: |
| 26 | + if (std::isinf(item.cost)) |
| 27 | +- return tr(u8"∞"); |
| 28 | ++ return tr("∞"); |
| 29 | + if (std::isnan(item.cost)) |
| 30 | + return QVariant(); |
| 31 | + return QLocale().toString(item.cost, 'f', 4); |
| 32 | +diff --git a/motion_planning_tasks/src/task_list_model.cpp b/motion_planning_tasks/src/task_list_model.cpp |
| 33 | +index 3cd6466..7c471d5 100644 |
| 34 | +--- a/motion_planning_tasks/src/task_list_model.cpp |
| 35 | ++++ b/motion_planning_tasks/src/task_list_model.cpp |
| 36 | +@@ -61,9 +61,9 @@ QVariant TaskListModel::horizontalHeader(int column, int role) { |
| 37 | + case 0: |
| 38 | + return tr("name"); |
| 39 | + case 1: |
| 40 | +- return tr(u8"✓"); |
| 41 | ++ return tr("✓"); |
| 42 | + case 2: |
| 43 | +- return tr(u8"✗"); |
| 44 | ++ return tr("✗"); |
| 45 | + case 3: |
| 46 | + return tr("time"); |
| 47 | + } |
0 commit comments