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
Vendored
Executable
+50
@@ -0,0 +1,50 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# @RDE_HEADER@
|
||||
# $Id$
|
||||
# $HeadURL$
|
||||
# $Author$
|
||||
#
|
||||
|
||||
|
||||
# Since 05-03-2024:
|
||||
BLDGS="A1 A2 A3 A4"
|
||||
|
||||
numOk=0;
|
||||
numFailure=0;
|
||||
|
||||
|
||||
for BLDG in ${BLDGS}
|
||||
do
|
||||
|
||||
echo "Bldg: '$BLDG':";
|
||||
|
||||
MyFile=`find ../QatarBuildings/buildings/ -iname "${BLDG}.flt.VWM_Building.xml"`
|
||||
|
||||
# BEFORE="Factor" ; AFTER="FACTOR"
|
||||
BEFORE1="ExclusionZoneProtectiveFactor>20<" ; AFTER1="ExclusionZoneProtectiveFactor>0<"
|
||||
BEFORE2="ExclusionZoneProtectiveFactor>50<" ; AFTER2="ExclusionZoneProtectiveFactor>20<"
|
||||
BEFORE3="OuterWallProtectiveFactor>150<" ; AFTER3="OuterWallProtectiveFactor>200<"
|
||||
BEFORE4="OuterWallProtectiveFactor>125<" ; AFTER4="OuterWallProtectiveFactor>200<"
|
||||
cmd="sed -i -e 's/${BEFORE1}/${AFTER1}/' -e 's/${BEFORE2}/${AFTER2}/' -e 's/${BEFORE3}/${AFTER3}/' -e 's/${BEFORE4}/${AFTER4}/' ${MyFile}"
|
||||
|
||||
# Bei mehreren Expression erfolgt die Auswertung erfolgt von links nach rechts:
|
||||
# echo AABB | sed -e 's/A/B/g' -e 's/B/X/g' -> XXXX
|
||||
# Anderfalls wäre der output: BBXX
|
||||
|
||||
|
||||
eval $cmd ;
|
||||
if [ $? -ne 0 ]; then
|
||||
((numFailure=numFailure+1))
|
||||
echo " failure on -> '$BLDG' ";
|
||||
echo "command failed, cmd= >>>$cmd<<<" ;
|
||||
else
|
||||
((numOk=numOk+1))
|
||||
echo " cmd= >>>$cmd<<< successfull"
|
||||
fi
|
||||
|
||||
done
|
||||
|
||||
echo " numOk = $numOk ";
|
||||
echo " numFailure = $numFailure ";
|
||||
|
||||
Reference in new issue
Block a user