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

@@ -56,13 +56,13 @@ bool DatabasesModel::initModel(const QSqlDatabase &db)
}
Exercise exercise;
exercise.m_id = q.value(0).toInt();
exercise.id = q.value(0).toInt();
exercise.name = q.value(1).toString();
exercise.startTime = q.value(2).toLongLong();
exercise.endTime = q.value(3).toLongLong();
exercise.dbName = QStringLiteral("lts_db_") + QString::number(exercise.m_id);
exercise.dbName = QStringLiteral("lts_db_") + QString::number(exercise.id);
exercise.stateId = q.value(4).toInt();
TRACE_LOG(m_logger) << "Found exercise with id=" << exercise.m_id << ", name=" << exercise.name << ", startTime="
TRACE_LOG(m_logger) << "Found exercise with id=" << exercise.id << ", name=" << exercise.name << ", startTime="
<< exercise.startTime << ", endTime=" << exercise.endTime << ", dbName=" << exercise.dbName
<< ", stateId=" << exercise.stateId;
if (exercise.stateId != 6)
@@ -86,7 +86,7 @@ QVariant DatabasesModel::data(const QModelIndex &index, int role) const
switch (index.column())
{
case Id:
return e.m_id;
return e.id;
case Name:
return QString(e.name);
case StartTime:
@@ -176,7 +176,7 @@ void DatabasesModel::onDataChanged(const Exercise &data, DataModification modTyp
row = m_vecData.indexOf(data);
if (row != -1)
if (removeRow(row))
emit dataChanged(index(std::min(row, m_vecData.size()-1), Columns::Id), index(m_vecData.size()-1, Columns::EndTime));
emit dataChanged(index(std::min<qsizetype>(row, m_vecData.size() - 1), Columns::Id), index(m_vecData.size()-1, Columns::EndTime));
return;
} // switch
}
@@ -32,8 +32,8 @@ struct Exercise
qint64 endTime = 0;
qint32 stateId = 0;
bool operator == (const Exercise &other) { return id == other.m_id; }
bool operator != (const Exercise &other) { return id != other.m_id; }
bool operator == (const Exercise &other) const { return id == other.id; }
bool operator != (const Exercise &other) const { return id != other.id; }
};
@@ -38,7 +38,7 @@ ENDIF()
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(OperatorApplication
ArcGISQt5Hack # make sure it's loaded *before* libEsriCommonQt.so
$<IF:$<TARGET_EXISTS:ArcGISQt5Hack>,ArcGISQt5Hack,> # make sure it's loaded *before* libEsriCommonQt.so (guard: only linked when the SituationMap viewer is built, matching CentralEffectSimulation)
${Qt6_Widgets}
Qt6::Network
nglapplication
@@ -36,6 +36,9 @@
#include <QInputDialog>
#include <QNetworkProxy>
#include <QtCore/QTimer>
#include <QRandomGenerator>
#include <QInputDevice>
#include <algorithm>
class CmdLineParser : public LtsCommandLineParser::LtsCommandLineParser
@@ -157,7 +160,7 @@ public:
bool isForcedTabletMode() const { return isSet(QStringLiteral("x")); }
bool isForcedWSMode() const { return isSet(QStringLiteral("w")); }
QString langIsoCode() const { return value(QStringLiteral("l")); }
QStringList ignoredPlugins() const { return value(QStringLiteral("ignore-plugins")).split(QLatin1Char(','), QString::SkipEmptyParts); }
QStringList ignoredPlugins() const { return value(QStringLiteral("ignore-plugins")).split(QLatin1Char(','), Qt::SkipEmptyParts); }
bool checkRequirements() const { return isSet(QStringLiteral("check-requirements")); }
QString skipScreen() const { return value(QStringLiteral("k")); }
QString qosFile() const { return value(QStringLiteral("q")).size() > 0 ? value(QStringLiteral("q")) : QString(); }
@@ -172,7 +175,7 @@ public:
// ------------------------------------------------------------------
int main(int argc, char **argv) // TODO: json strings to lower
{
qsrand(time(nullptr));
QRandomGenerator::global()->seed(time(nullptr));
QCoreApplication::setAttribute(Qt::AA_UseDesktopOpenGL);
@@ -380,7 +383,7 @@ int main(int argc, char **argv) // TODO: json strings to lower
if (!skipScreen.isEmpty())
{
QStringList skipScreenList(skipScreen.split(QLatin1Char('.'), QString::SkipEmptyParts));
QStringList skipScreenList(skipScreen.split(QLatin1Char('.'), Qt::SkipEmptyParts));
int skipScreenListCount = skipScreenList.count();
@@ -431,7 +434,8 @@ int main(int argc, char **argv) // TODO: json strings to lower
sessionData->setAsTablet();
else if (options.isForcedWSMode())
sessionData->setAsTablet(false);
else if (!QTouchDevice::devices().isEmpty())
else if (std::any_of(QInputDevice::devices().cbegin(), QInputDevice::devices().cend(),
[](const QInputDevice *dev) { return dev && dev->type() == QInputDevice::DeviceType::TouchScreen; }))
sessionData->setAsTablet();
LtsWidgets::LtsComboBox::setUseSelectionDialog(sessionData->isTablet());
@@ -72,7 +72,7 @@ NGL_TARGET_COMPILE_DEFINITIONS(thp_viewer
${VLC_DEFINES}
)
NGL_TARGET_LINK_LIBRARIES(thp_viewer
ArcGISQt5Hack # make sure it's loaded *before* libEsriCommonQt.so
$<IF:$<TARGET_EXISTS:ArcGISQt5Hack>,ArcGISQt5Hack,> # make sure it's loaded *before* libEsriCommonQt.so (guard: only linked when the SituationMap viewer is built, matching CentralEffectSimulation)
${VLC_LIBRARIES}
Qt6::Core
@@ -258,8 +258,9 @@ void ThpViewer::onLinkClicked(const QUrl &url)
const QString path = url.path();
const QString lpath = path.toLower();
const QStringRef ext = lpath.splitRef(QLatin1Char('.')).last();
const QStringRef ext2Chars = ext.left(2);
// Qt6: QStringRef/QString::splitRef were removed; QStringView::split provides zero-copy access
const QStringView ext = QStringView{lpath}.split(QLatin1Char('.')).last();
const QStringView ext2Chars = ext.left(2);
ui->audioWidget->stop();
ui->videoWidget->stop();
@@ -370,7 +371,7 @@ void ThpViewer::onLinkClicked(const QUrl &url)
ui->backButton->setEnabled(true);
}
else if (ext == QLatin1String("html") &&
lpath.midRef(lpath.lastIndexOf(QLatin1Char('/')) + 1).startsWith(QLatin1String("combined_")))
QStringView{lpath}.mid(lpath.lastIndexOf(QLatin1Char('/')) + 1).startsWith(QLatin1String("combined_")))
{
// Kombiniert
QHash<QString, QUrl> urls = getCombinedPlaybackDetails(url);
@@ -32,10 +32,11 @@ public:
bool needsToBeOpenedExternally(const QUrl &url)
{
const QString lpath = url.toString();
const QStringRef ext = lpath.splitRef(QLatin1Char('.')).last();
const QStringRef ext2Chars = ext.left(2);
// Qt6: QStringRef/QString::splitRef and QString::midRef were removed; use QStringView
const QStringView ext = QStringView{lpath}.split(QLatin1Char('.')).last();
const QStringView ext2Chars = ext.left(2);
if (ext == QLatin1String("html") &&
lpath.midRef(lpath.lastIndexOf(QLatin1Char('/')) + 1).startsWith(QLatin1String("combined_")))
QStringView{lpath}.mid(lpath.lastIndexOf(QLatin1Char('/')) + 1).startsWith(QLatin1String("combined_")))
return true;
// PDF
if (ext == QLatin1String("pdf"))