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:
422 files changed
+1013
-599
No files matched your search
@@ -10,6 +10,7 @@
|
||||
# Data Plugin
|
||||
#
|
||||
NGL_ADD_LIBRARY(WS PreDataPlugin MODULE pre_data_plugin.cpp pre_data_plugin.h)
|
||||
set_target_properties(PreDataPlugin PROPERTIES AUTOMOC ON)
|
||||
NGL_TARGET_LINK_LIBRARIES(PreDataPlugin
|
||||
Qt6::Core
|
||||
PreDataPluginInterface
|
||||
|
||||
+1
-2
@@ -11,10 +11,9 @@
|
||||
|
||||
namespace PresentationManagement
|
||||
{
|
||||
class DataPlugin final : public QObject, public DataPluginBase::Plugin
|
||||
class DataPlugin final : public DataPluginBase::Plugin
|
||||
{
|
||||
Q_PLUGIN_METADATA(IID "data:3:pre")
|
||||
Q_INTERFACES(DataPluginBase::Plugin)
|
||||
|
||||
Q_OBJECT
|
||||
public:
|
||||
|
||||
+1
-1
@@ -33,7 +33,7 @@ TopicRecorder::TopicRecorder(const int topicId, const QString &topicName, const
|
||||
, m_topicName(topicName)
|
||||
, m_topicId(topicId)
|
||||
, m_length((m_stopTime - (m_startTime - offset)) / 1000),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
const auto screenGlobalPos = screen->mapToGlobal({0,0});
|
||||
const auto screenGeo = screen->geometry();
|
||||
|
||||
|
||||
+1
-1
@@ -25,7 +25,7 @@ TopicShotter::TopicShotter(const int topicId, const QString &topicName, const Sc
|
||||
, m_topicH(topicH)
|
||||
, m_desc(desc)
|
||||
, m_isFilterTopic(isFilterTopic),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
|
||||
|
||||
|
||||
TopicShotter::~TopicShotter()
|
||||
|
||||
Reference in new issue
Block a user