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:
1 parent
040bdd558f
commit
3f7beb3c7e
154 files changed
+24958
-167
No files matched your search
@@ -40,7 +40,7 @@ SampleModel::SampleData SampleModel::SampleData::decodeFromMime(const QByteArray
|
||||
QString tn;
|
||||
quint64 ptr;
|
||||
dds::core::xtypes::DynamicData *dynDataPtr;
|
||||
stream >> tn >> ptr >> ret.topicName >> ret.m_description >> ret.pause;
|
||||
stream >> tn >> ptr >> ret.topicName >> ret.description >> ret.pause;
|
||||
ret.typeName = tn.toStdString();
|
||||
dynDataPtr = reinterpret_cast<dds::core::xtypes::DynamicData *>(ptr);
|
||||
ret.legatusData = QSharedPointer<dds::core::xtypes::DynamicData>(new dds::core::xtypes::DynamicData(*dynDataPtr));
|
||||
@@ -103,7 +103,7 @@ QVariant SampleModel::data(const QModelIndex &index, int role) const
|
||||
case Column::TopicName:
|
||||
return data.topicName;
|
||||
case Column::Description:
|
||||
return data.m_description;
|
||||
return data.description;
|
||||
case Column::TypeName:
|
||||
return QString::fromStdString(data.typeName);
|
||||
case Column::Pause:
|
||||
@@ -133,10 +133,10 @@ bool SampleModel::setData(const QModelIndex &index, const QVariant &value, int r
|
||||
case Column::TypeName:
|
||||
break;
|
||||
case Column::Description:
|
||||
data.m_description = value.toString();
|
||||
data.description = value.toString();
|
||||
retVal = true;
|
||||
if (data.dialog)
|
||||
data.dialog->setWindowTitle(QString::fromLatin1("%1 (%2)").arg(data.m_description, data.topicName));
|
||||
data.dialog->setWindowTitle(QString::fromLatin1("%1 (%2)").arg(data.description, data.topicName));
|
||||
break;
|
||||
case Column::Pause:
|
||||
{
|
||||
@@ -313,7 +313,7 @@ bool SampleModel::dropMimeData(const QMimeData *data, Qt::DropAction action,
|
||||
|
||||
sample.legatusData = QSharedPointer<dds::core::xtypes::DynamicData>(new dds::core::xtypes::DynamicData(*ptr));
|
||||
sample.typeName = ptr->type().name();
|
||||
sample.m_description = sample.topicName;
|
||||
sample.description = sample.topicName;
|
||||
|
||||
int beginRow;
|
||||
if (row != -1)
|
||||
@@ -339,7 +339,7 @@ bool SampleModel::dropMimeData(const QMimeData *data, Qt::DropAction action,
|
||||
// TODO: set topicName
|
||||
sample.typeName = typeName.toStdString();
|
||||
sample.topicName = QString::fromLatin1(topicName.data());
|
||||
sample.m_description = sample.topicName;
|
||||
sample.description = sample.topicName;
|
||||
sample.legatusData = QSharedPointer<dds::core::xtypes::DynamicData>(new dds::core::xtypes::DynamicData(NGLSettings::instance()->dataTopic(sample.topicName).type));
|
||||
|
||||
int beginRow;
|
||||
@@ -370,7 +370,7 @@ bool SampleModel::addRow(const dds::core::xtypes::DynamicData &data, const QStri
|
||||
|
||||
id.typeName = data.type().name();
|
||||
id.topicName = topicName;
|
||||
id.m_description = description.isEmpty() ? topicName : description;
|
||||
id.description = description.isEmpty() ? topicName : description;
|
||||
id.legatusData = QSharedPointer<dds::core::xtypes::DynamicData>(new dds::core::xtypes::DynamicData(data.type()));
|
||||
|
||||
return addRow(id);
|
||||
@@ -423,7 +423,7 @@ bool SampleSortModel::lessThan(const QModelIndex &left,
|
||||
case SampleModel::Column::TopicName:
|
||||
return dataLeft.topicName < dataRight.topicName;
|
||||
case SampleModel::Column::Description:
|
||||
return dataLeft.m_description < dataRight.m_description;
|
||||
return dataLeft.description < dataRight.description;
|
||||
case SampleModel::Column::TypeName:
|
||||
return dataLeft.typeName < dataRight.typeName;
|
||||
case SampleModel::Column::Pause:
|
||||
|
||||
Reference in new issue
Block a user