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,126 @@
|
||||
<!--
|
||||
DTD fuer taktische Zeichen nach APP6a (Draft)
|
||||
(c)RDE 2008
|
||||
Stephan Kuhagen
|
||||
-->
|
||||
|
||||
|
||||
<!--
|
||||
Das Basiselement des Dokuments ist das Symbol. Es enthaelt verschiedene
|
||||
Elemente und Attribute zur grafischen sowie abstrakten Beschreibung eines
|
||||
Symbols. Attribute und <graphic> sind fuer Symbole nach APP6a vorgesehen,
|
||||
waehrend alte uebersetzte Symbole ausschliesslich aus Daten in <graphic>
|
||||
bestehen, und alle anderen Attribute, sofern vorhanden, mit dem Wert
|
||||
"undefined" belegt sind.
|
||||
|
||||
text1: 1 Zeile mit max 4 Zeichen
|
||||
text2: 2 Zeilen mit je max 5 Zeichen
|
||||
text3: 3 Zeilen mit je max 6 zeichen
|
||||
|
||||
text-attribute: align: left center right
|
||||
fontgroesse abhaengig von t1-3
|
||||
|
||||
|
||||
-->
|
||||
<!ELEMENT symbol (branch*,(text1|text2|text3),graphic)>
|
||||
|
||||
<!ELEMENT name (#PCDATA)>
|
||||
<!ELEMENT branch EMPTY>
|
||||
<!ELEMENT text1 (data)>
|
||||
<!ELEMENT text2 (data,data)>
|
||||
<!ELEMENT text3 (data,data,data)>
|
||||
<!ELEMENT graphic (ellipse|line|polygon|rect)*>
|
||||
<!ELEMENT data (#PCDATA)>
|
||||
|
||||
<!ELEMENT matrixref EMPTY>
|
||||
|
||||
<!ELEMENT ellipse (point,point)>
|
||||
<!ELEMENT line (point,point)>
|
||||
<!ELEMENT polygon ((point,point,point),point*)>
|
||||
<!ELEMENT rect (point,point)>
|
||||
<!ELEMENT icon (point,point)>
|
||||
<!ELEMENT point EMPTY>
|
||||
|
||||
<!ATTLIST symbol
|
||||
version CDATA #REQUIRED
|
||||
id CDATA #REQUIRED
|
||||
transformed CDATA #IMPLIED
|
||||
dimen (undefined|air_space|land_units|land_equipment|over_water|under_water) #REQUIRED
|
||||
affil (undefined|unknown|friend|neutral|enemy) #REQUIRED
|
||||
bcdab (undefined|crew|squad|section|platoon|squadron|company|battalion|regiment|brigade|division|corps|army|army_group|region|installation|task_force|dummy) #REQUIRED
|
||||
command_level (undefined|platoon|squadron|company|battalion|regiment|brigade|division) #REQUIRED
|
||||
mob (undefined|wheel|wheel_all_terrain|chain|chain_all_terrain|trailer|train) #REQUIRED
|
||||
vehicle (undefined|vehicle|util_vehicleA|util_vehicleB|util_vehicle_armored|armored_infantry|armored_infantryB|carrier|armored_tank) #IMPLIED
|
||||
intrinsicmob (undefined|wheel|wheel_all_terrain|chain|chain_all_terrain|trailer|train) #IMPLIED
|
||||
arming (undefined|gun|auto_weapon|ATGun|ADGun|morter|howitzer|rocket|missile) #IMPLIED>
|
||||
|
||||
<!ATTLIST misc
|
||||
class (undefined|lightA|mediumA|heavyA|lightB|mediumB|heavyB|lightC|mediumC|heavyC|ArmLight|ArmMedium|ArmHeavy) #IMPLIED>
|
||||
|
||||
|
||||
<!ATTLIST branch
|
||||
class (undefined|tank|infantry|reconnaissance|sof_unit|artillery|army_air_defense|engineer_troops|nbc_defense|army_aviation|signal|supply|psyops|medical|civil_military_coop) #REQUIRED>
|
||||
|
||||
<!ATTLIST text1
|
||||
maxdatalength CDATA #REQUIRED>
|
||||
|
||||
<!ATTLIST text2
|
||||
maxdatalength CDATA #REQUIRED>
|
||||
|
||||
<!ATTLIST text3
|
||||
maxdatalength CDATA #REQUIRED>
|
||||
|
||||
<!ATTLIST data
|
||||
align (left|center|right) #REQUIRED>
|
||||
|
||||
<!ATTLIST graphic
|
||||
scale CDATA #REQUIRED>
|
||||
|
||||
<!--
|
||||
Die Grafikelemente
|
||||
(rotate: counterclockwise)
|
||||
-->
|
||||
|
||||
<!ATTLIST ellipse
|
||||
transform CDATA #IMPLIED
|
||||
rotate CDATA #REQUIRED
|
||||
linewidth CDATA #REQUIRED
|
||||
linestyle (solid|dashed|dotted|dashed_dotted) #REQUIRED
|
||||
fill CDATA #REQUIRED
|
||||
start CDATA #REQUIRED
|
||||
extent CDATA #REQUIRED
|
||||
closed CDATA #REQUIRED>
|
||||
|
||||
<!ATTLIST line
|
||||
transform CDATA #IMPLIED
|
||||
rotate CDATA #REQUIRED
|
||||
linewidth CDATA #REQUIRED
|
||||
linestyle (solid|dashed|dotted|dashed_dotted) #REQUIRED>
|
||||
|
||||
<!ATTLIST polygon
|
||||
transform CDATA #IMPLIED
|
||||
rotate CDATA #REQUIRED
|
||||
linewidth CDATA #REQUIRED
|
||||
linestyle (solid|dashed|dotted|dashed_dotted) #REQUIRED
|
||||
fill CDATA #REQUIRED
|
||||
closed CDATA #REQUIRED>
|
||||
|
||||
<!ATTLIST rect
|
||||
transform CDATA #IMPLIED
|
||||
rotate CDATA #REQUIRED
|
||||
linewidth CDATA #REQUIRED
|
||||
linestyle (solid|dashed|dotted|dashed_dotted) #REQUIRED
|
||||
fill CDATA #REQUIRED>
|
||||
|
||||
<!ATTLIST icon
|
||||
transform CDATA #IMPLIED
|
||||
rotate CDATA #REQUIRED
|
||||
linewidth CDATA #REQUIRED
|
||||
linestyle (solid|dashed|dotted|dashed_dotted) #REQUIRED
|
||||
position CDATA #REQUIRED
|
||||
id CDATA #REQUIRED
|
||||
icon_type CDATA #REQUIRED>
|
||||
|
||||
<!ATTLIST point
|
||||
x CDATA #REQUIRED
|
||||
y CDATA #REQUIRED>
|
||||
Reference in new issue
Block a user