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

@@ -30,7 +30,8 @@ static QVector<DDSGeneric::TopicDescription> getAvailableTopicTypes() // get top
return false;
QMap<std::string,DDSGeneric::TopicDescription> topics = typePlugin->getDataTopics();
topics.unite(typePlugin->getFunctionTopics());
// Qt6: QMap::unite removed; insert() keeps the same "existing keys win" semantics
topics.insert(typePlugin->getFunctionTopics());
QMap<std::string, DDSGeneric::TopicDescription>::iterator it = topics.begin();
for( ; it != topics.end(); ++it)
@@ -71,23 +72,24 @@ public:
return availDataTopics;
// Convert list of DoTypes, separated by comma (given by user)
// Qt6: QStringRef/QString::splitRef removed; QStringView::split provides the same tokenization
const QString doTypeStr = value(QLatin1String("t"));
const QVector<QStringRef> strList = doTypeStr.splitRef(QLatin1Char(','), QString::SkipEmptyParts);
const QList<QStringView> strList = QStringView{doTypeStr}.split(QLatin1Char(','), Qt::SkipEmptyParts);
if (strList.isEmpty())
return availDataTopics;
QVector<DDSGeneric::TopicDescription> vDt;
vDt.reserve(strList.size());
for (const QStringRef &doTypeStr : strList)
for (const QStringView doTypeView : strList)
{
bool ok = false;
int doTypeInt = doTypeStr.toInt(&ok);
const int doTypeInt = doTypeView.toInt(&ok);
INFO_LOG(logger) << "doType: " << doTypeInt;
if (ok && doTypeInt >= 0 && doTypeInt < availDataTopics.size())
vDt.append(availDataTopics.at(doTypeInt));
else
WARNING_LOG(logger) << doTypeStr.toString() << " is not a valid DoType, skipping.. ";
WARNING_LOG(logger) << doTypeView.toString() << " is not a valid DoType, skipping.. ";
}
return vDt;
}