Restores generic_fts include and fixes FTS connext header

qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/connext.h

@@ -282,7 +282,7 @@ template <typename REQUEST, typename REPLY> class Requester final : public Reply
     , m_dataReader(nullptr)
     , m_contentFilteredTopic(nullptr)
     , m_curInstanceHandle(dds::core::InstanceHandle::nil())
-    , m_logger(NGL::getNGLLogger("connext.requester"))
+    , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("connext.requester"))
   {
   }
 
@@ -417,6 +417,7 @@ private:
   dds::sub::DataReader<REPLY> m_dataReader;
   dds::topic::ContentFilteredTopic<REPLY> m_contentFilteredTopic;
   dds::core::InstanceHandle m_curInstanceHandle;
+  NGL::INGLLogger &m_logger;
 };
 
 template <typename REQUEST, typename REPLY> class Replier final : public ReplyRequestBase<REQUEST, REPLY>
@@ -431,7 +432,7 @@ template <typename REQUEST, typename REPLY> class Replier final : public ReplyRe
     , m_dataReader(dds::sub::DataReader<REQUEST>(replierParams.subscriber(),
                                                  ReplyRequestBase<REQUEST, REPLY>::m_requestTopic,
                                                  replierParams.datareader_qos()))
-    , m_logger(NGL::getNGLLogger("connext.replier"))
+    , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("connext.replier"))
   {
   }
 
@@ -500,6 +501,7 @@ private:
   connext::ReplierParams<REQUEST, REPLY> m_replierParams;
   dds::pub::DataWriter<REPLY> m_dataWriter;
   dds::sub::DataReader<REQUEST> m_dataReader;
+  NGL::INGLLogger &m_logger;
 };
 
 } // namespace connext

qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_internal.h

@@ -2,6 +2,10 @@
 
 #pragma once
 
+// Declares the FTS::GenericFts template that generic_fts_impl.h's
+// GenericFtsImpl derives from. Present in the qt5 original; without it
+// GenericFts is no known template at the point of derivation.
+#include "generic_fts.h"
 #include <ddsfts_export.h>
 #include "logger.h"