Qt6 Migration: BUILD_RTI guards und CMake fixes

- BUILD_RTI conditional compilation für RTI Connext DDS dependencies
- Namespace fixes in core_dtc.h (Core:: → DDS::Core::)
- CMakeLists.txt: BUILD_RTI option und conditional dependencies
- Handler minelayer: namespace closing mit BUILD_RTI guard
- Build erfolgreich mit BUILD_RTI=OFF validiert

Signed-off-by: Torsten Wierschin <torsten.wierschin@life-maps.com>
This commit is contained in:
torsten committed 2026-08-21 18:37:18 +02:00
1 parent c599be63e3
commit 950d669538
422 files changed
+1013 -599

No files matched your search

@@ -10,6 +10,7 @@
# Data Plugin
#
NGL_ADD_LIBRARY(WS FlmDataPlugin MODULE flm_data_plugin.cpp flm_data_plugin.h)
set_target_properties(FlmDataPlugin PROPERTIES AUTOMOC ON)
NGL_TARGET_LINK_LIBRARIES(FlmDataPlugin
Qt6::Core
FlmDataPluginInterface
@@ -10,10 +10,9 @@
namespace FileManagement
{
class DataPlugin final : public QObject, public DataPluginBase::Plugin
class DataPlugin final : public DataPluginBase::Plugin
{
Q_PLUGIN_METADATA(IID "data:3:flm")
Q_INTERFACES(DataPluginBase::Plugin)
Q_OBJECT
public:
@@ -6,7 +6,7 @@
namespace FileManagement
{
FlmHQReportModel::FlmHQReportModel(QObject* parent)
: QAbstractListModel(parent), m_logger(NGL::NGLLoggerBootstrap::getLogger())
: QAbstractListModel(parent), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
{
}
@@ -17,7 +17,7 @@ namespace FileManagement
OfficeIntegration::OfficeIntegration(const FileManagement::FileContent &fileContent, QObject *parent) : QObject(parent)
, m_selectedFileContent(fileContent),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
OfficeIntegration::~OfficeIntegration()
{
@@ -18,7 +18,7 @@ FileContentPreviewPlaybackWidget::FileContentPreviewPlaybackWidget(const std::sh
, m_ui(new Ui::FileContentPreviewPlaybackWidget)
, m_getContent(new FileManagement::GetFileContent(ftc, this))
, m_closeTimer(new QTimer(this)),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
m_ui->setupUi(this);
m_ui->lblPixmap->setVisible(false);