Berrux Kana
3f7beb3c7e
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).
26 lines
1.1 KiB
C
26 lines
1.1 KiB
C
#pragma once
|
|
|
|
// Stub export header for LtsProjectionWorkstation
|
|
// (the real header is generated by CMake via GENERATE_EXPORT_HEADER when the
|
|
// library is built; this stub covers non-RTI builds and is found first on the
|
|
// -I line because the source include/ dir precedes the build tree)
|
|
|
|
#ifndef LTSPROJECTIONWORKSTATION_EXPORT_H
|
|
#define LTSPROJECTIONWORKSTATION_EXPORT_H
|
|
|
|
// Must expand to a default-visibility attribute, NOT to empty: the build sets
|
|
// CMAKE_CXX_VISIBILITY_PRESET=hidden, and this stub is found before the
|
|
// CMake-generated header (the source include/ dir precedes the build tree on
|
|
// the -I line). With an empty macro the LtsProjectionWorkstation class symbols
|
|
// would be hidden and consumers (e.g. OperatorApplication) fail to link
|
|
// libLtsProjectionWorkstation.so.
|
|
// If the library is not built, the attribute is harmless: it only changes
|
|
// visibility, not symbol resolution.
|
|
#if defined(_MSC_VER)
|
|
# define LTSPROJECTIONWORKSTATION_EXPORT __declspec(dllexport)
|
|
#else
|
|
# define LTSPROJECTIONWORKSTATION_EXPORT __attribute__((visibility("default")))
|
|
#endif
|
|
#define LTSPROJECTIONWORKSTATION_NO_EXPORT
|
|
|
|
#endif // LTSPROJECTIONWORKSTATION_EXPORT_H
|