Cleans up only warnings and specific CMake/include path error in the Qt6 migration tree, using strictly minimal changes with minimal side effects.

qt6-after/qt6-migrated-legatus/.envrc

@@ -0,0 +1 @@
+export MIGRATE_PIPELINE_ROOT=/home/torsten/sandbox/qt6-migration-pipeline

qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/XmlReader.cpp

@@ -82,15 +82,13 @@ bool XmlReader::readServiceFile(const QString& svcFile, const QString& idlServic
 
     INFO_LOG(m_logger) << "SvcFile: " << svcFile;
 
-    QString errMsg;
-    int errLine = 0;
-    int errColumn = 0;
     QDomDocument doc;
-    if (!doc.setContent(&f, &errMsg, &errLine, &errColumn))
+    auto parseResult = doc.setContent(&f);
+    if (!parseResult)
     {
-        m_errorString = QLatin1String("Error parsing service file '") + svcFile + QLatin1String("': ") + errMsg +
-                        QLatin1String(" at ") + QString::number(errLine) + QLatin1Char(':') +
-                        QString::number(errColumn);
+        m_errorString = QLatin1String("Error parsing service file '") + svcFile + QLatin1String("' at line ") +
+                        QString::number(parseResult.errorLine) + QLatin1Char(':') +
+                        QString::number(parseResult.errorColumn);
         ERROR_LOG(m_logger) << m_errorString;
         return false;
     }

qt6-after/qt6-migrated-legatus/Lts/DDS/DDSConnector/dds_connector.cpp

@@ -22,7 +22,8 @@ DdsConnector::DdsConnector(int domainId,
                            int exerciseId,
                            DDS::QosProfile::ConnectionType connectionType,
                            const QUrl &tcpConnectionUrl)
-  : m_domainId(domainId)
+  : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("Common.DDSConnector"))
+  , m_domainId(domainId)
   , m_defaultPartitionType(defaultPartitionType)
   , m_partitionId(partitionId)
   , m_exerciseId(exerciseId)
@@ -32,7 +33,6 @@ DdsConnector::DdsConnector(int domainId,
   , m_publisher(nullptr)
   , m_subscriber(nullptr)
   , m_wsHandler(nullptr)
-  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("Common.DDSConnector"))
 {
     initInternal();
     DEBUG_LOG(m_logger) << "DdsConnector ctor: " << m_domainId << "," << m_partitionId << "," << m_exerciseId << ","

qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/subscriber_listener.cpp

@@ -23,7 +23,7 @@ void SubscriberListener::addCallback(const std::string& topicName, const std::st
     QWriteLocker l(&m_accessLock);
     if (m_bPrepareForShutdown)
         return;
-    m_droCallbacks.insertMulti(std::make_pair(topicName, topicTypeName), fillData(dataReader, cb));
+    m_droCallbacks.insert(std::make_pair(topicName, topicTypeName), fillData(dataReader, cb));
 }
 
 void SubscriberListener::removeCallback(const std::string& topicName, const std::string& topicTypeName,

qt6-after/qt6-migrated-legatus/Z/src/NGLLogger/CMakeLists.txt

@@ -23,7 +23,6 @@ NGL_TARGET_INCLUDE_DIRECTORIES(NGLLogger
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}/Z/src/NGLLogger
 )
 
 # Export headers for other modules building in the same tree (e.g., TetraIF)

qt6-after/qt6-migrated-legatus/Z/src/NGLLogger/NGLLogger.cpp

@@ -300,6 +300,7 @@ NGL::NGLLogger &NGL::NGLLogger::getNGLRootLogger()
 
 
 
+#ifdef HAVE_LOG4QT
 static QString findConfigFile(const QString &configfilename)
 {
   if (configfilename.isEmpty())
@@ -318,6 +319,7 @@ static QString findConfigFile(const QString &configfilename)
 
   return QString();
 }
+#endif
 
 
 

qt6-after/qt6-migrated-legatus/docker_build.sh

@@ -3,8 +3,8 @@ set -e
 
 # Run CMake configuration and build inside Docker
 docker run --rm \
-  -v /home/torsten/swy/sandbox:/workspace \
-  -v /home/torsten/swy/sandbox/rti_license.dat:/workspace/rti_license.dat \
+  -v ${MIGRATE_PIPELINE_ROOT}:/workspace \
+  -v ${MIGRATE_PIPELINE_ROOT}/rti_license.dat:/workspace/rti_license.dat \
   -w /workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus \
   ubuntu:26.04 bash -c "
     apt-get update -qq && \

qt6-after/qt6-migrated-legatus/include/DDS/Generic/generic_base.h

@@ -38,11 +38,11 @@ DDSGEN_EXPORT inline std::string getShortTopicName(const std::string &fqName) {
 }
 
 // Stub for getMethod - returns default-constructed QMetaMethod
-DDSGEN_EXPORT inline QMetaMethod getMethod(NGL::INGLLogger &logger,
-                                           QObject *objectToInform,
-                                           const char *slotToExecute,
-                                           const char *signalSignature,
-                                           bool bWarnOnEmptySlot = true) {
+DDSGEN_EXPORT inline QMetaMethod getMethod(NGL::INGLLogger & /*logger*/,
+                                           QObject * /*objectToInform*/,
+                                           const char * /*slotToExecute*/,
+                                           const char * /*signalSignature*/,
+                                           bool /*bWarnOnEmptySlot*/ = true) {
     // Stub implementation - returns default QMetaMethod
     return QMetaMethod();
 }