Commit Graph
16 Commits
Author SHA1 Message Date
Berrux Kana 3f7beb3c7e Qt6 migration: build fixes for Groups 10/11 + missing plugin modules
Continue the Qt5->Qt6 migration so the LTS Projects (Group 10) and LTS
Application (Group 11) compile, link, and ctest runs.

Qt5->Qt6 API migration (resolves removed/deprecated Qt6 APIs) across Lts
Tools and Apps, e.g. QAction->QActionGroup, QAbstractSocket::errorOccurred,
Qt::SkipEmptyParts, QRandomGenerator, QInputDevice::DeviceType,
QRegularExpression, QLatin1Literal->QStringLiteral, and the SampleModel
m_description->description rename.

CMake build fixes:
- CMakeLists.txt: add Lts/Common to CMAKE_AUTOMOC_INCLUDE_DIRECTORIES so moc
  resolves Q_INTERFACES(ProjectPlugin::Plugin) for the migrated Projects.
- cmake/NGLMacros.cmake: NGL_COMPILE_RESOURCES - replace return() (which aborts
  the calling CMakeLists.txt) with an if/else/endif.
- OpApp/THP: guard the ArcGISQt5Hack link with $<IF:$<TARGET_EXISTS:...>> (the
  target is absent when the SituationMap viewer is stubbed); matches
  CentralEffectSimulation.
- LtsSession: prefer the in-tree svcCoreClient target over a FIND_LIBRARY in
  /usr/local/lib.
- CnrProxyTester/DotMatrixDisplay: set AUTOUIC_SEARCH_PATHS for the ui/ subdir.
- TopicDiscover: link NGLLogger.

Export-header visibility stubs (expand the empty *_EXPORT macro to
__attribute__((visibility("default"))); the build sets -fvisibility=hidden and
these stubs shadow the CMake-generated header):
- include/LtsProjectionWorkstation/ltsprojectionworkstation_export.h (fixes
  undefined reference to LtsProjectionWorkstation::getInstance /
  setProjectionOperatorPreset)
- include/LtsSession/ltssession_export.h, include/LtsUtilsGuiDds/ltsutilsguidds_export.h (same pattern)

New plugin modules (copied from legacy) so LtsAppDescriptorChecker finds the
gui:3 IIDs referenced by the Projects' apps.json:
- TakeHomePackageManager/OldTHP              gui:3:tpm.man, gui:3:tpm.usb
- PresentationManagement/.../ScriptEditor   gui:3:pre.script.edit
- Timeline/Gui/EventTimelineClassic         gui:3:tln.view

new_docker_build.sh: correct group targets to the actual CMake target names,
guard LtsReportDisplay on BUILD_CODIFICATION, and skip modules unavailable in
the prebuilt image (AsmWorkstationCertifier/botan2, TrajectoryWidget,
VideoImport, thp_viewer/VLC).
2026-10-05 10:49:34 +02:00
berrux-dev 8345470273 fix Warning 2026-10-03 09:20:13 +02:00
berrux-dev 593c221d23 Merge feature/qt6-migration-basis-modules-merge-viewer-validation into feature/migrate-lts-projects-and-application
Cherry-picks 5501d1e50 (stub-header updates, superseded by 4223ca2ff relocation); resolves 1 content + 24 modify/delete conflicts; validates BUILD_RTI=ON BUILD_GRANTLEE=ON incl. Tools Groups 6-11.
2026-09-28 01:05:39 +02:00
torstenandCopilot 1e1a3e6f30 Group 8 migration: Add build script support and CTest infrastructure
- Added --group8/--no-group8 argument support to new_docker_build.sh
- Added BUILD_GROUP8 variable and GROUP8_TARGETS array
- Fixed ProjectSettingsEditor Qt6 migration (QT5_ADD_RESOURCES → qt6_add_resources)
- Created CTest test files for 4 buildable Group 8 tools:
  - test_ParticipantDataGenerator.cpp
  - test_ProjectSettingsEditor.cpp
  - test_QLedLine.cpp
  - test_QLedMatrix.cpp
- Added test exclusion filters to tests/CMakeLists.txt for Group 8 tools
- Excluded non-CMake projects: JustusTimeline (Python), Mout (web), NodeJs (Node.js), ProjectSettingsParser (Python)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2026-09-24 16:33:26 +00:00
torstenandCopilot db8adbfe3b Qt6 migration: Group 7 tools (A,B,C,E,I directories)
Migration completed for 6 buildable tools:
- AdlerWebSocketSimulator (Qt6::WebSockets)
- AsmWorkstationCertifier (Unix-only, requires botan2)
- CnrProxyTester
- ConfigX (Qt6 fixes: qt6_add_resources, removed QDesktopWidget)
- EEMFakeServer
- egcuSimulator

Changes:
- Added --group7/--no-group7 support to new_docker_build.sh
- Created CTest test files for 6 Group 7 tools
- Fixed ConfigX Qt6 migration issues
- Added test exclusion filters to tests/CMakeLists.txt

Note: Build validation blocked by pre-existing Group 3 (svcPdmClient)
compilation errors unrelated to Group 7 changes.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2026-09-24 16:24:37 +00:00
torstenandCopilot 9f0076a197 Migrate LTS Tools Group 6 (D&L) to Qt6
Build script changes:
- Add --group6/--no-group6 argument support to new_docker_build.sh
- Add GROUP6_TARGETS array with 11 LTS tools
- Add BUILD_GROUP6 environment variable export
- Add GROUP6 build invocation in run_build_group function

Test infrastructure:
- Create CTest test files for all 11 Group 6 tools
- Add exclusion filters in tests/CMakeLists.txt for conditional builds
- Tests follow gtest pattern: CompilationStub, Qt6ApiCompatibility, BasicFunctionality

Qt6 migration bug fixes:
- DBAdministration: Fix m_id → id member access (3 files)
- DBAdministration: Add missing QFile include in showLogFile.cpp
- DBUpdate: Add CMAKE_AUTOUIC_SEARCH_PATHS for ui/ directory
- DBUpdate: Fix m_id → id, m_description → description (3 files)

Build validation:
- DBAdministration, DBOperatorSettingsRemover, DBUpdate build successfully
- Remaining tools blocked by pre-existing Group 3 (ExerciseManagement) errors
- Policy checks passed

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2026-09-23 15:21:14 +00:00
berrux-dev 881d44f4dd Migrates residual Lts sources to generated rtiddsgen API
Adds NmeaManagement tests, fixes codegen includes and Qt6 SerialPort CMake target.
2026-09-23 12:05:37 +02:00
torstenandCopilot 691bf21f3e Replace Qt5:: with Qt6:: in 26 CMakeLists.txt files
Qt6 migration: Update all target_link_libraries to use Qt6::Core, Qt6::Widgets,
Qt6::Network, Qt6::Svg, Qt6::Xml, Qt6::Concurrent, Qt6::PrintSupport, Qt6::Sql,
Qt6::Test, Qt6::WebSockets, Qt6::SerialPort instead of Qt5:: equivalents.

Affected components:
- Lts/Common: LtsRestClient, LtsWidgets
- Lts/Application: THP, SitMapReplayTest
- Lts/Plugins: ParticipantManagement, ServiceManagement
- Lts/Services: VideoOverlayManagement
- Lts/Tools: 18 tool CMakeLists.txt files

Validated with BUILD_RTI=ON and BUILD_RTI=OFF - both builds successful.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2026-09-15 19:38:18 +00:00
torstenandCopilot 7173785915 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>
2026-09-15 18:20:26 +00:00
berrux-dev 60f7ea0d9a Added LogViewer again 2026-09-15 10:37:29 +02:00
berrux-dev 92ad7d4686 remove all unneeded module listed from Niklas 2026-09-14 21:15:42 +02:00
torsten 0c1503d85c Adds latest migration results 2026-09-01 12:27:57 +02:00
torsten bb1447c858 Qt6 migration fixes: RTI DDS alias targets, ErrorMessage namespace, DDS header include path 2026-08-27 09:02:26 +02:00
torstenandCopilot c143ff8a4f Session 025: Fix QTextCodec migration issues
- Z/src/qsql_informix/qsql_informix.cpp: Fixed QTextCodec include path
  (QtCore → QtGui) as QTextCodec moved to QtGui module in Qt6
- Z/src/qsql_informix/CMakeLists.txt: Added Qt6::Gui dependency required
  for QTextCodec
- Lts/Tools/TextEditorTest/textedit.cpp: Fixed Qt::codecForHtml →
  QTextCodec::codecForHtml (static method on QTextCodec class in Qt6)

These are minimal fixes required for Qt6 compatibility. QTextCodec is now
part of QtGui module and codecForHtml is a static method on QTextCodec
class rather than Qt namespace function.

Co-authored-by: Copilot <2235566219+Copilot@users.noreply.github.com>
2026-08-25 18:50:12 +02:00
torstenandCopilot 71636a42c4 Lts/Tools: Complete QRegExp to QRegularExpression migration
- Migrated QRegExp → QRegularExpression in:
  - DdsView/detailview.cpp (line 636)
  - DdsView/sequences/abstractsequencewidget.cpp (line 167)
  - VapixConfig/httprequesthandler.cpp (lines 68, 95, 136)
  - ConfigX/configurator.cpp
  - LogViewer/sortfiltermodel.cpp
  - SqlBrowser/BrowserWnd.cpp
- Added Qt6::Core5Compat to TextEditorTest CMakeLists.txt for QTextCodec support
- All QRegExp instances in Lts/Tools now migrated to QRegularExpression

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2026-08-25 14:22:18 +02:00
torsten d5c13033e2 Session 022: Migrate Lts/Tools (72 submodules) to Qt6
- Copied complete Lts/Tools directory from qt5-before to qt6-after
- Updated 32 CMakeLists.txt files (Qt5:: → Qt6::)
- Tools subdirectory already included in parent Lts/CMakeLists.txt
- All 72 tool submodules now present in qt6-migrated-legatus
- Includes: Adler, ArAssets, ConfigX, DBAdministration, DBUpdate,
  DdsView, InfrastructureManagement, and 67 more tools
- C++17 standard (RTI 7.7.0 compatibility maintained)
- Tests deferred until final validation phase

Migration progress:
✅ Lts/Application (68 files)
✅ Lts/DDS (verified Qt6-ready)
✅ Lts/Plugins (60 submodules, verified)
✅ Lts/Projects (5 submodules, verified)
✅ Lts/Proxies (13 submodules, verified)
✅ Lts/Services (47 submodules, verified)
✅ Lts/Tools (72 submodules, copied + CMake updated)
✅ Lts/Viewer (LtsFileDialog, LtsReportDisplay, SituationMap)
🟡 TetraIF (partial)
🟡 Z (partial: nglwidgets, QtSingleApplication, qsql_informix, WMS_Interface)
2026-08-25 14:07:20 +02:00