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).
This commit is contained in:
Berrux Kana committed 2026-10-05 10:49:34 +02:00
1 parent 040bdd558f
commit 3f7beb3c7e
154 files changed
+24958 -167

No files matched your search

@@ -905,7 +905,6 @@ if [[ "${BUILD_ARCGIS}" == "ON" ]]; then
advancedSymbologyXML
LtsDataView
LtsDataViewTest
LtsReportDisplay
)
else
GROUP5_TARGETS=(
@@ -917,7 +916,6 @@ if [[ "${BUILD_ARCGIS}" == "ON" ]]; then
LtsDataViewTest
LtsFileDialog
LtsFileDialogTest
LtsReportDisplay
)
fi
else
@@ -929,7 +927,6 @@ else
advancedSymbologyXML
LtsDataView
LtsDataViewTest
LtsReportDisplay
)
else
GROUP5_TARGETS=(
@@ -940,11 +937,17 @@ else
LtsDataViewTest
LtsFileDialog
LtsFileDialogTest
LtsReportDisplay
)
fi
fi
# LtsReportDisplay only exists when BUILD_CODIFICATION=ON (the module
# RETURN()s otherwise); requesting the target unconditionally aborts make
# with "No rule to make target"
if [[ "${BUILD_CODIFICATION}" == "ON" ]]; then
GROUP5_TARGETS+=("LtsReportDisplay")
fi
# Group 6: LTS Tools (Qt6 migration targets)
# These tools require RTI DDS for DataSampleGenerator, DataSampleReceiver, and DdsView
GROUP6_TARGETS=(
@@ -964,7 +967,7 @@ GROUP6_TARGETS=(
# Group 7: LTS Tools A,B,C,E,I directories (Qt6 migration targets)
GROUP7_TARGETS=(
AdlerWebSocketSimulator
AsmWorkstationCertifier
# AsmWorkstationCertifier - requires botan2 (not available in prebuilt image); target not generated
CnrProxyTester
ConfigX
EEMFakeServer
@@ -975,8 +978,8 @@ GROUP7_TARGETS=(
GROUP8_TARGETS=(
ParticipantDataGenerator
ProjectSettingsEditor
QLedLine
QLedMatrix
qledline
qledmatrix
)
# Group 9: LTS Tools R,S,T,V,W directories (Qt6 migration targets)
@@ -985,14 +988,16 @@ GROUP9_TARGETS=(
ScreenIdShow
SerialToTcpConverter
Splash
SqlBrowser
TextEditorTest
Times
TopicDiscover
TrajectoryWidget
VapixConfig
VideoImport
WlsRandomPositions
sqlbrowser
textEditorTest
ctime
stime
topicdiscover
topicdiscoverexe
# TrajectoryWidget - standalone sub-project (own project()/find_package), not part of the main build
vapixconfig
# VideoImport - subdir commented out in Lts/Tools/CMakeLists.txt
wlsRandomPositions
)
# Group 10: LTS Projects (Qt6 migration targets)
@@ -1011,7 +1016,7 @@ GROUP10_TARGETS=(
# Group 11: LTS Application (Qt6 migration targets)
GROUP11_TARGETS=(
OperatorApplication
thp_viewer
# thp_viewer - Lts/Application/THP subdir commented out (VLC dependency unavailable)
aarApp
)