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

Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set

Browse Source 
new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
berrux-dev committed 2026-10-20 09:36:57 +02:00
1 parent 2b957d1edb
commit 598fc2560e
1718 files changed
+126739 -18495
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/pdm_handler.cpp
+9 -8
View File
@@ -2,6 +2,7 @@
#include "pdm_handler.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <QtCore/QJsonArray>
#include <QtCore/QJsonDocument>
@@ -46,25 +47,25 @@ void PdmHandler::getChargeTypes()
for(const ProjectDataManagement::ChargeType &charge : chargeTypes)
{
if (charge.disEntity().empty())
if (charge.disEntity.empty())
continue;
QJsonObject chargeType;
chargeType[QStringLiteral("id")] = charge.id();
chargeType[QStringLiteral("name")] = QString::fromStdString(charge.name());
chargeType[QStringLiteral("entityTypeStruct")] = QString::fromStdString(charge.disEntity());
chargeType[QStringLiteral("id")] = charge.id;
chargeType[QStringLiteral("name")] = QString::fromStdString(charge.name);
chargeType[QStringLiteral("entityTypeStruct")] = QString::fromStdString(charge.disEntity);
int gearTypeId = 0;
for(const ProjectDataManagement::GearTypeChargeType &val : gearTypeChargeTypes)
{
if(val.chargeTypeId() == charge.id())
if(val.chargeTypeId == charge.id)
{
gearTypeId = val.gearTypeId();
gearTypeId = val.gearTypeId;
break;
}
}
chargeType[QStringLiteral("primaryGearTasCode")] = gearTypes[gearTypeId].tasCode();
QJsonDocument doc = QJsonDocument::fromJson(QByteArray::fromStdString(charge.properties()));
chargeType[QStringLiteral("primaryGearTasCode")] = gearTypes[gearTypeId].tasCode;
QJsonDocument doc = QJsonDocument::fromJson(QByteArray::fromStdString(charge.properties));
QJsonObject prop = doc.object();
chargeType[QStringLiteral("radius")] = prop[QStringLiteral("impactRadius")];