lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migration of Legatus codebase to Qt6 with RTI Connext DDS 7.7 integration is partially complete. Core DDS targets build successfully, but ProjectDataManagement module blocks full ddsfts compilation due to IDL definition conflicts.

Browse Source
This commit is contained in:
torsten committed 2026-09-07 19:30:39 +02:00
1 parent 758ae0f53f
commit ba1d9e2c04
256 files changed
+1170 -610
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/CMakeLists.txt
+1
View File
@@ -46,6 +46,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(TopicEditorBase
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_BINARY_DIR}/../ # auto-export file
${CMAKE_BINARY_DIR}/Z/src/NGLLogger # ngllogger_export.h
)
if(QT6_GUI_AVAILABLE)
qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_utils.cpp
+4 -3
View File
@@ -219,7 +219,8 @@ QColor topicTypeColor(TopicType topicType)
std::ostream& operator<<(std::ostream& stream, TopicType topicType)
{
stream << "TopicType::" << topicTypeString(topicType).toStdString().c_str();
const std::string str = std::string("TopicType::") + topicTypeString(topicType).toStdString();
stream << str;
return stream;
}
@@ -274,7 +275,7 @@ QJsonObject TopicData::toJson() const
QDataStream& operator<<(QDataStream& stream, const TopicData& data)
{
const QByteArray properties = QJsonDocument(data.properties).toBinaryData();
const QByteArray properties = QJsonDocument(data.properties).toJson(QJsonDocument::Compact);
stream << data.id << static_cast<quint8>(data.topicType) << data.startTime << data.duration << data.state
<< data.index << properties << data.description << data.channel << data.parentChannel << data.x << data.y
<< data.w << data.h;
@@ -288,7 +289,7 @@ QDataStream& operator>>(QDataStream& stream, TopicData& data)
stream >> data.id >> topicType >> data.startTime >> data.duration >> data.state >> data.index >> properties >>
data.description >> data.channel >> data.parentChannel >> data.x >> data.y >> data.w >> data.h;
data.topicType = static_cast<TopicType>(topicType);
data.properties = QJsonDocument::fromBinaryData(properties).object();
data.properties = QJsonDocument::fromJson(properties).object();
return stream;
}