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,92 @@
|
||||
-- cameras (mounting_point_type_id = 4)
|
||||
INSERT INTO ism.ism_asset (id, name, hostname, mounting_point_type_id, barcode, properties, asset_state_id)
|
||||
VALUES (10, 'CAM_UBEICE0001', 'UBEICE0001', 4, null, '{"type": "vapix", "hasMicrophone": true}', 0),
|
||||
(11, 'CAM_UBEICE0002', 'UBEICE0056', 4, null, '{"type": "vapix", "hasMicrophone": true}', 0);
|
||||
|
||||
|
||||
-- cameras (mounting_point_type_id = 3)
|
||||
INSERT INTO ism.ism_asset (id, name, hostname, mounting_point_type_id, barcode, properties, asset_state_id)
|
||||
VALUES (15, 'CAM_UBEOCE0001', 'UBEOCE0001', 3, null, '{"type": "vapix"}', 0);
|
||||
|
||||
|
||||
-- IPS IN (mounting_point_type_id = 6)
|
||||
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
|
||||
VALUES (20, 'IPS-IN_2101', 6, '{"opticalCode":2101}', 0, null);
|
||||
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
|
||||
VALUES (21, 'IPS-IN_2102', 6, '{"opticalCode":2102}', 0, null);
|
||||
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
|
||||
VALUES (22, 'IPS-IN_2103', 6, '{"opticalCode":2103}', 0, null);
|
||||
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
|
||||
VALUES (23, 'IPS-IN_2104', 6, '{"opticalCode":2104}', 0, null);
|
||||
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
|
||||
VALUES (24, 'IPS-IN_2105', 6, '{"opticalCode":2105}', 0, null);
|
||||
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
|
||||
VALUES (25, 'IPS-IN_2106', 6, '{"opticalCode":2106}', 0, null);
|
||||
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
|
||||
VALUES (26, 'IPS-IN_2107', 6, '{"opticalCode":2107}', 0, null);
|
||||
|
||||
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
|
||||
VALUES (27, 'IPS-IN_2201', 6, '{"opticalCode":2201}', 0, null);
|
||||
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
|
||||
VALUES (28, 'IPS-IN_2202', 6, '{"opticalCode":2202}', 0, null);
|
||||
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
|
||||
VALUES (29, 'IPS-IN_2203', 6, '{"opticalCode":2203}', 0, null);
|
||||
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
|
||||
VALUES (30, 'IPS-IN_2204', 6, '{"opticalCode":2204}', 0, null);
|
||||
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
|
||||
VALUES (31, 'IPS-IN_2205', 6, '{"opticalCode":2205}', 0, null);
|
||||
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
|
||||
VALUES (32, 'IPS-IN_2206', 6, '{"opticalCode":2206}', 0, null);
|
||||
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
|
||||
VALUES (33, 'IPS-IN_2207', 6, '{"opticalCode":2207}', 0, null);
|
||||
|
||||
-- IPS OUT (mounting_point_type_id = 5)
|
||||
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
|
||||
VALUES (40, 'IPS-OUT_1001', 5, '{"opticalCode":1001}', 0, null);
|
||||
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
|
||||
VALUES (41, 'IPS-OUT_1002', 5, '{"opticalCode":1002}', 0, null);
|
||||
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
|
||||
VALUES (42, 'IPS-OUT_1003', 5, '{"opticalCode":1003}', 0, null);
|
||||
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
|
||||
VALUES (43, 'IPS-OUT_1004', 5, '{"opticalCode":1004}', 0, null);
|
||||
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
|
||||
VALUES (44, 'IPS-OUT_1005', 5, '{"opticalCode":1005}', 0, null);
|
||||
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
|
||||
VALUES (45, 'IPS-OUT_1006', 5, '{"opticalCode":1006}', 0, null);
|
||||
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
|
||||
VALUES (46, 'IPS-OUT_1007', 5, '{"opticalCode":1007}', 0, null);
|
||||
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
|
||||
VALUES (47, 'IPS-OUT_1008', 5, '{"opticalCode":1008}', 0, null);
|
||||
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
|
||||
VALUES (48, 'IPS-OUT_1009', 5, '{"opticalCode":1008}', 0, null);
|
||||
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
|
||||
VALUES (49, 'IPS-OUT_1010', 5, '{"opticalCode":1008}', 0, null);
|
||||
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
|
||||
VALUES (50, 'IPS-OUT_1011', 5, '{"opticalCode":1008}', 0, null);
|
||||
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, properties, asset_state_id, barcode)
|
||||
VALUES (81, 'IPS-OUT_3001', 5, '{"opticalCode":1008}', 0, null);
|
||||
|
||||
|
||||
|
||||
-- BuildingSensorModule (mounting_point_type_id =1)
|
||||
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, barcode, hostname, properties, asset_state_id)
|
||||
VALUES (51, 'BSM_0001', 1, 'BC_BSM_0001', 'UBEBSM0018', '{"port":10001}', 0);
|
||||
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, barcode, hostname, properties, asset_state_id)
|
||||
VALUES (52, 'BSM_0002', 1, 'BC_BSM_0002', 'UBEBSM0222', '{"port":10001}', 0);
|
||||
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, barcode, hostname, properties, asset_state_id)
|
||||
VALUES (53, 'BSM_0003', 1, 'BC_BSM_0003', 'UBEBSM0001', '{"port":10001}', 0);
|
||||
|
||||
|
||||
|
||||
-- EGCU (mounting_point_type_id = 12)
|
||||
INSERT INTO ism.ism_asset (id, name, hostname, mounting_point_type_id, barcode, properties, asset_state_id)
|
||||
VALUES (60, 'UBECU0001', 'UBEOSGU0001', 12, null, '{"effects": [], "password": "mout11de", "username": "katar", "scenarios": [{"id": 1, "damage": 50}], "hitSoundVolume": 100, "fireSoundVolume": 100, "activationSoundVolume": 100}', 0);
|
||||
|
||||
|
||||
-- AnnouncementUnit (mounting_point_type_id =10)
|
||||
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, barcode, hostname, properties, asset_state_id)
|
||||
VALUES (70, 'OCU_0001', 10, null, 'UBEOCU0010', '{"type": "vapix"}', 0);
|
||||
INSERT INTO ism.ism_asset (id, name, mounting_point_type_id, barcode, hostname, properties, asset_state_id)
|
||||
VALUES (71, 'ICU_0001', 10, null, 'UBEICU0020', '{"type": "vapix"}', 0);
|
||||
|
||||
|
||||
Reference in new issue
Block a user