lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge feature/migrate-module-tetraif-only into feature/qt6-migration-projects-app-tools-viewer-validation

Browse Source 
Resolves 0 textual conflicts; unions new_docker_build.sh (TetraIF GROUP6 CoPrtCnv/PrtCnvLib/PrtCnv + ddsview; t* re-activated per build) and keeps qledline convergent fix; validates BUILD_RTI=ON BUILD_GRANTLEE=ON.
This commit is contained in:
berrux-dev committed 2026-10-05 14:57:33 +02:00
2 parents 43300efaa7 7b090a26ca
commit ed81fccb1d
10 files changed
+24 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/TetraIF/CMakeLists.txt
-2
View File
@@ -4,8 +4,6 @@
# $Author$
#
IF(BUILD_RTI)
ADD_SUBDIRECTORY(CoPrtCnv)
ADD_SUBDIRECTORY(LogView)
ADD_SUBDIRECTORY(PrtCnv)
ENDIF()
qt6-after/qt6-migrated-legatus/TetraIF/CoPrtCnv/CMakeLists.txt
-1
View File
@@ -23,7 +23,6 @@ find_package(Qt6 COMPONENTS Core QUIET)
if (Qt6_FOUND)
set(_QT_CORE_TARGET Qt6::Core)
else()
find_package(Qt6 COMPONENTS Core QUIET)
set(_QT_CORE_TARGET Qt6::Core)
endif()
NGL_TARGET_LINK_LIBRARIES(CoPrtCnv
qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramEditModel.hpp
+1 -1
View File
@@ -3,7 +3,7 @@
#pragma once
#include <QtGui/QAbstractTableModel>
#include <QtCore/QAbstractTableModel>
#include <QtCore/QSharedPointer>
#include <QtCore/QSet>
#include "LogViewTelegram.hpp"
qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvApplication.cpp
+1 -1
View File
@@ -53,7 +53,7 @@ static std::string threadIdToString(PrtCnvApplication::E_ThreadId id)
PrtCnvApplication::PrtCnvApplication()
: m_Config(nullptr)
, m_exerciseId(0)
, m_accessMutex(QMutex::Recursive)
, m_logger(getLogger("PrtCnvApplication"))
{}
qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvApplication.hpp
+4 -1
View File
@@ -19,6 +19,7 @@
#include "logger.h"
#include <nglsettings/nglsettings_settings.h>
#include <QtCore/QMutex>
#include <QtCore/QRecursiveMutex>
#include "prtcnvlib_export.h"
#include <TrainingAreaBase/training_area_telegrams.h>
@@ -165,7 +166,7 @@ protected:
mutable QMutex m_accessMutex;
mutable QRecursiveMutex m_accessMutex;
QString m_dbDriver;
QString m_dbHostName;
@@ -173,6 +174,8 @@ protected:
QString m_dbSchemaName;
QString m_dbUserName;
QString m_dbPassword;
NGL::INGLLogger &m_logger;
};
}
qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvBroadcastMgr.cpp
+3 -2
View File
@@ -35,8 +35,9 @@ PrtCnvBroadcastMgr::PrtCnvBroadcastMgr() : m_ClaimWindow(0)
, m_IsFullLoad(false)
, m_FinishedBroadcastIndex(0)
, m_FirstBroadcastIndexOfBc1(0)
, m_loggerBcRequest(getLogger("PrtCnvBroadcastMgr.BcRequest")),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
, m_loggerBcRequest(getLogger("PrtCnvBroadcastMgr.BcRequest"))
, m_logger(getLogger("PrtCnvBroadcastMgr"))
{
}
qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvBroadcastMgr.hpp
+1
View File
@@ -350,6 +350,7 @@ Q_SIGNALS:
void areaEffectSimulationDeactivated(int wirkfeldKennung);
private:
NGL::INGLLogger &m_logger;
NGL::INGLLogger &m_loggerBcRequest;
};
qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvCentralThread.cpp
+1 -1
View File
@@ -23,7 +23,7 @@
#include <CoPrtCnv/CoPrtCnvTelegramConverter.hpp>
#include <CoPrtCnv/CoPrtCnvCentralTelegram.hpp>
#include <LtsUtils/dds_bitarray.h>
#include <LtsUtilsCore/dds_bitarray.h>
#include <QtCore/QTimer>
#include <QtCore/QCoreApplication>
qt6-after/qt6-migrated-legatus/new_docker_build.sh
+3
View File
@@ -962,6 +962,9 @@ GROUP6_TARGETS=(
LicenceEditor
localDomainFinder
LogViewer
CoPrtCnv
PrtCnvLib
PrtCnv
)
# Group 7: LTS Tools A,B,C,E,I directories (Qt6 migration targets)
qt6-after/qt6-migrated-legatus/rti_license.dat
+10
View File
@@ -0,0 +1,10 @@
#-----------------------------------------------------------------
# Issued to: Test on Wed Sep 23 17:48:43 2026
# Contact: Moi Meme Phone: ...
# email: berrux@outlook.de
# Do NOT edit this file.
SERVER <embedded> ffffffff 1700
FEATURE RTIPRO RTI 4. 20-nov-2026 0 F8031B976E72D17E8B03 "License=Evaluation;Company=Test;Contact=Moi Meme;Email=berrux@outlook.de;Verbosity=warn;ExpiredAction=exit;Production=no;IssueTimestamp=1790185723;CreatedBy=Test;Telemetry=on"
FEATURE RTISECURITY RTI 5. 20-nov-2026 0 B6F179F2381FC5CAE4DF "License=Evaluation;Company=Test;Contact=Moi Meme;Email=berrux@outlook.de;Verbosity=warn;ExpiredAction=exit;Production=no;IssueTimestamp=1790185723;CreatedBy=Test;Telemetry=on"
FEATURE RTIRWT RTI 6. 20-nov-2026 0 EE2FBD16BE636F7CAD9E "License=Evaluation;Company=Test;Contact=Moi Meme;Email=berrux@outlook.de;Verbosity=warn;ExpiredAction=exit;Production=no;IssueTimestamp=1790185723;CreatedBy=Test;Telemetry=on"
FEATURE RTICDS RTI 6. 20-nov-2026 0 15B75FC1054D5E39A55D "License=Evaluation;Company=Test;Contact=Moi Meme;Email=berrux@outlook.de;Verbosity=warn;ExpiredAction=exit;Production=no;IssueTimestamp=1790185723;CreatedBy=Test;Telemetry=on"