Qt6 Migration: Complete migration with DDS/RTI support and build validation
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
18662 files changed
+4115092
-5435
No files matched your search
+42
@@ -0,0 +1,42 @@
|
||||
{
|
||||
"data":
|
||||
{
|
||||
"aircraftId": 1,
|
||||
"altitudeTarget": 56,
|
||||
"altitudeTargetMode": 1,
|
||||
"distance2InitialPointMode": 1,
|
||||
"distanceInitialPoint2Target": 925.9,
|
||||
"finalAttackHeading":
|
||||
{
|
||||
"heading": 120,
|
||||
"headingHigh": 110,
|
||||
"headingLow": 130
|
||||
},
|
||||
"finalAttackHeadingMode": 2,
|
||||
"friendlies":
|
||||
{
|
||||
"bearing": 88,
|
||||
"distance": 133.6
|
||||
},
|
||||
"heading2InitialPointMode": 2,
|
||||
"headingInitialPoint2Target": 300,
|
||||
"initialPoint":
|
||||
{
|
||||
"lat": 53.06,
|
||||
"lon": 8.97
|
||||
},
|
||||
"initialPointMode": 1,
|
||||
"modeFriendlies": 1,
|
||||
"targetPosition":
|
||||
{
|
||||
"lat": 53.06,
|
||||
"lon": 8.97
|
||||
},
|
||||
"targetPositionMode": 1,
|
||||
"timeForTarget": 57600,
|
||||
"timeForTargetMode": 2,
|
||||
"timestamp": -1
|
||||
},
|
||||
"type": "NasatNineLiner",
|
||||
"uuid": "blasdbasd-kjladjaslasdklj"
|
||||
}
|
||||
+42
@@ -0,0 +1,42 @@
|
||||
{
|
||||
"data":
|
||||
{
|
||||
"aircraftId": 1,
|
||||
"altitudeTarget": 56,
|
||||
"altitudeTargetMode": 1,
|
||||
"distance2InitialPointMode": 1,
|
||||
"distanceInitialPoint2Target": 925.9,
|
||||
"finalAttackHeading":
|
||||
{
|
||||
"heading": 120,
|
||||
"headingHigh": 110,
|
||||
"headingLow": 130
|
||||
},
|
||||
"finalAttackHeadingMode": 2,
|
||||
"friendlies":
|
||||
{
|
||||
"bearing": 88,
|
||||
"distance": 133.6
|
||||
},
|
||||
"heading2InitialPointMode": 2,
|
||||
"headingInitialPoint2Target": 301,
|
||||
"initialPoint":
|
||||
{
|
||||
"lat": 53.061,
|
||||
"lon": 8.971
|
||||
},
|
||||
"initialPointMode": 1,
|
||||
"modeFriendlies": 1,
|
||||
"targetPosition":
|
||||
{
|
||||
"lat": 53.061,
|
||||
"lon": 8.971
|
||||
},
|
||||
"targetPositionMode": 1,
|
||||
"timeForTarget": 57600,
|
||||
"timeForTargetMode": 2,
|
||||
"timestamp": -1
|
||||
},
|
||||
"type": "NasatNineLiner",
|
||||
"uuid": "blasdbasd-kjladjaslasdklj"
|
||||
}
|
||||
+42
@@ -0,0 +1,42 @@
|
||||
{
|
||||
"data":
|
||||
{
|
||||
"aircraftId": 1,
|
||||
"altitudeTarget": 56,
|
||||
"altitudeTargetMode": 1,
|
||||
"distance2InitialPointMode": 1,
|
||||
"distanceInitialPoint2Target": 925.9,
|
||||
"finalAttackHeading":
|
||||
{
|
||||
"heading": 120,
|
||||
"headingHigh": 110,
|
||||
"headingLow": 130
|
||||
},
|
||||
"finalAttackHeadingMode": 2,
|
||||
"friendlies":
|
||||
{
|
||||
"bearing": 88,
|
||||
"distance": 133.6
|
||||
},
|
||||
"heading2InitialPointMode": 2,
|
||||
"headingInitialPoint2Target": 302,
|
||||
"initialPoint":
|
||||
{
|
||||
"lat": 53.062,
|
||||
"lon": 8.972
|
||||
},
|
||||
"initialPointMode": 1,
|
||||
"modeFriendlies": 1,
|
||||
"targetPosition":
|
||||
{
|
||||
"lat": 53.062,
|
||||
"lon": 8.972
|
||||
},
|
||||
"targetPositionMode": 1,
|
||||
"timeForTarget": 57600,
|
||||
"timeForTargetMode": 2,
|
||||
"timestamp": -1
|
||||
},
|
||||
"type": "NasatNineLiner",
|
||||
"uuid": "blasdbasd-kjladjaslasdklj"
|
||||
}
|
||||
+42
@@ -0,0 +1,42 @@
|
||||
{
|
||||
"data":
|
||||
{
|
||||
"aircraftId": 1,
|
||||
"altitudeTarget": 56,
|
||||
"altitudeTargetMode": 1,
|
||||
"distance2InitialPointMode": 1,
|
||||
"distanceInitialPoint2Target": 925.9,
|
||||
"finalAttackHeading":
|
||||
{
|
||||
"heading": 120,
|
||||
"headingHigh": 110,
|
||||
"headingLow": 130
|
||||
},
|
||||
"finalAttackHeadingMode": 2,
|
||||
"friendlies":
|
||||
{
|
||||
"bearing": 88,
|
||||
"distance": 133.6
|
||||
},
|
||||
"heading2InitialPointMode": 2,
|
||||
"headingInitialPoint2Target": 303,
|
||||
"initialPoint":
|
||||
{
|
||||
"lat": 53.0633,
|
||||
"lon": 8.9733
|
||||
},
|
||||
"initialPointMode": 1,
|
||||
"modeFriendlies": 1,
|
||||
"targetPosition":
|
||||
{
|
||||
"lat": 53.0633,
|
||||
"lon": 8.9733
|
||||
},
|
||||
"targetPositionMode": 1,
|
||||
"timeForTarget": 57600,
|
||||
"timeForTargetMode": 2,
|
||||
"timestamp": -1
|
||||
},
|
||||
"type": "NasatNineLiner",
|
||||
"uuid": "blasdbasd-kjladjaslasdklj"
|
||||
}
|
||||
+42
@@ -0,0 +1,42 @@
|
||||
{
|
||||
"data":
|
||||
{
|
||||
"aircraftId": 1,
|
||||
"altitudeTarget": 56,
|
||||
"altitudeTargetMode": 1,
|
||||
"distance2InitialPointMode": 1,
|
||||
"distanceInitialPoint2Target": 925.9,
|
||||
"finalAttackHeading":
|
||||
{
|
||||
"heading": 120,
|
||||
"headingHigh": 110,
|
||||
"headingLow": 130
|
||||
},
|
||||
"finalAttackHeadingMode": 2,
|
||||
"friendlies":
|
||||
{
|
||||
"bearing": 88,
|
||||
"distance": 133.6
|
||||
},
|
||||
"heading2InitialPointMode": 2,
|
||||
"headingInitialPoint2Target": 304,
|
||||
"initialPoint":
|
||||
{
|
||||
"lat": 53.0644,
|
||||
"lon": 8.9744
|
||||
},
|
||||
"initialPointMode": 1,
|
||||
"modeFriendlies": 1,
|
||||
"targetPosition":
|
||||
{
|
||||
"lat": 53.0644,
|
||||
"lon": 8.9744
|
||||
},
|
||||
"targetPositionMode": 1,
|
||||
"timeForTarget": 57600,
|
||||
"timeForTargetMode": 2,
|
||||
"timestamp": -1
|
||||
},
|
||||
"type": "NasatNineLiner",
|
||||
"uuid": "blasdbasd-kjladjaslasdklj"
|
||||
}
|
||||
+42
@@ -0,0 +1,42 @@
|
||||
{
|
||||
"data":
|
||||
{
|
||||
"aircraftId": 1,
|
||||
"altitudeTarget": 56,
|
||||
"altitudeTargetMode": 1,
|
||||
"distance2InitialPointMode": 1,
|
||||
"distanceInitialPoint2Target": 925.9,
|
||||
"finalAttackHeading":
|
||||
{
|
||||
"heading": 120,
|
||||
"headingHigh": 110,
|
||||
"headingLow": 130
|
||||
},
|
||||
"finalAttackHeadingMode": 2,
|
||||
"friendlies":
|
||||
{
|
||||
"bearing": 88,
|
||||
"distance": 133.6
|
||||
},
|
||||
"heading2InitialPointMode": 2,
|
||||
"headingInitialPoint2Target": 305,
|
||||
"initialPoint":
|
||||
{
|
||||
"lat": 53.0655,
|
||||
"lon": 8.9755
|
||||
},
|
||||
"initialPointMode": 1,
|
||||
"modeFriendlies": 1,
|
||||
"targetPosition":
|
||||
{
|
||||
"lat": 53.0655,
|
||||
"lon": 8.97455
|
||||
},
|
||||
"targetPositionMode": 1,
|
||||
"timeForTarget": 57600,
|
||||
"timeForTargetMode": 2,
|
||||
"timestamp": -1
|
||||
},
|
||||
"type": "NasatNineLiner",
|
||||
"uuid": "blasdbasd-kjladjaslasdklj"
|
||||
}
|
||||
Reference in new issue
Block a user