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
@@ -0,0 +1,153 @@
|
||||
{
|
||||
"stateTransitions":{
|
||||
"CREATED":[
|
||||
"EX-Anmeldung"
|
||||
],
|
||||
"CONNECTED":[
|
||||
"EX-Anmeldung",
|
||||
"EX-Abmeldung",
|
||||
"EX-Verbindungsanfrage"
|
||||
],
|
||||
"CONNECTION_FAILED":[
|
||||
"EX-Anmeldung",
|
||||
"EX-NOT IMPLEMENTED YET"
|
||||
],
|
||||
"REGISTERED":[
|
||||
"EX-Abmeldung",
|
||||
"EX-Status",
|
||||
"EX-SQ(WS)",
|
||||
"EX-Verbindungsanfrage"
|
||||
]
|
||||
},
|
||||
"telegrams":
|
||||
{
|
||||
"EX-Meldung Allgemein":{
|
||||
"uuid": "",
|
||||
"version": "",
|
||||
"timestamp": 1,
|
||||
"sender": "",
|
||||
"reciver": "",
|
||||
"referenceUuid": ""
|
||||
},
|
||||
"EX-Anmeldung":{
|
||||
"type":"EX-Anmeldung",
|
||||
"typeId": 1,
|
||||
"data":{
|
||||
"partyId": 1,
|
||||
"adlerVerbund": 0,
|
||||
"szenar": "Ultra krasses Szenar junge. ich schoere das geht hart ab. Dieses szenar kann alles."
|
||||
}
|
||||
},
|
||||
"EX-Abmeldung":{
|
||||
"type":"EX-Abmeldung",
|
||||
"typeId": 2,
|
||||
"data":{
|
||||
"partyId": 1
|
||||
}
|
||||
},
|
||||
"EX-Verbindungsanfrage":{
|
||||
"type":"EX-Verbindungsanfrage",
|
||||
"typeId": 4
|
||||
},
|
||||
"EX-Status":{
|
||||
"type":"EX-Status",
|
||||
"typeId": 6,
|
||||
"data":{
|
||||
"status": "Aktiv"
|
||||
}
|
||||
},
|
||||
"EX-SQ(WS)":{
|
||||
"type": "EX-SQ(WS)",
|
||||
"typeId": 7,
|
||||
"data":{
|
||||
"typ": "",
|
||||
"kenner": "",
|
||||
"status": "",
|
||||
"einheit":{
|
||||
"verein":"",
|
||||
"r": 1,
|
||||
"oi": "L",
|
||||
"geschosse":[
|
||||
{
|
||||
"geschosssorte": "",
|
||||
"ladung": "",
|
||||
"zuender": "",
|
||||
"anzahl": 1
|
||||
}
|
||||
],
|
||||
"koordinate": "",
|
||||
"wirkungsbereich":{
|
||||
"grundrichtung":1,
|
||||
"links": 1,
|
||||
"rechts": 1
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
},
|
||||
"fullTelegrams":{
|
||||
"EX-SQ(WS)":{
|
||||
"type": "EX-SQ(WS)",
|
||||
"typeId": 7,
|
||||
"data":{
|
||||
"typ": {
|
||||
"type":"Enum",
|
||||
"values":
|
||||
[
|
||||
"Pzh",
|
||||
"Mrs",
|
||||
"Mars"
|
||||
]
|
||||
},
|
||||
"kenner": {
|
||||
"type":"Enum",
|
||||
"values":[
|
||||
"A",
|
||||
"B",
|
||||
"C",
|
||||
"D",
|
||||
"E",
|
||||
"F",
|
||||
"G",
|
||||
"H",
|
||||
"I",
|
||||
"J",
|
||||
"K",
|
||||
"L",
|
||||
"M",
|
||||
"N",
|
||||
"O",
|
||||
"P"
|
||||
]
|
||||
},
|
||||
"status": {
|
||||
"type": "Enum",
|
||||
"values":[
|
||||
"Einsatzbereit",
|
||||
"Nicht Einsatzbereit"
|
||||
]
|
||||
},
|
||||
"einheit":{
|
||||
"verein":"",
|
||||
"r": 1,
|
||||
"oi": "L",
|
||||
"geschosse":[
|
||||
{
|
||||
"geschosssorte": "",
|
||||
"ladung": "",
|
||||
"zuender": "",
|
||||
"anzahl": 1
|
||||
}
|
||||
],
|
||||
"koordinate": "",
|
||||
"wirkungsbereich":{
|
||||
"grundrichtung":1,
|
||||
"links": 1,
|
||||
"rechts": 1
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user