Merge feature/lts-viewer-validation-testing-phase into feature/qt6-migration-basis-modules-merge

Resolves 1 conflict (new_docker_build.sh, union of viewer-only + codification options); folds in fixes for pre-existing defects surfaced by the validation runs (KDReports-qt6 wiring, LtsSession RTI linking, LtsFileDialog/WLS/BSM Qt6/RTI API migration, GROUP4 target list, new --cmake_build_flags option); validated with BUILD_RTI=ON BUILD_GRANTLEE=ON in 3 Docker runs (run 3: build green, 6 base-state first-run CTest failures documented).
This commit is contained in:
berrux-dev committed 2026-09-27 07:33:29 +02:00
commit 9c1ac7cbef
30 files changed
+376 -247

No files matched your search

@@ -47,6 +47,10 @@ NGL_TARGET_LINK_LIBRARIES(BuildingControlBsm
BuildingControlCommon
svcTabCommon
)
NGL_TARGET_INCLUDE_DIRECTORIES(BuildingControlBsm
PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/../..
)
NGL_ADD_EXECUTABLE(AAR SV BuildingControlTestBsm bsm_test_main.cpp)
NGL_TARGET_LINK_LIBRARIES(BuildingControlTestBsm
@@ -3,6 +3,7 @@
#include "bsm_api.h"
#include "bsm_socket_handler.h"
#include <TrainingAreaBase/logger.h>
namespace BuildingControlUnit
{
@@ -6,6 +6,7 @@
#include "bsm_telegrams_configuration_setup.h"
#include <QtCore/QTimer>
#include <QtNetwork/QHostAddress>
#include <TrainingAreaBase/logger.h>
static const int s_aliveTimeout = 10;
namespace BuildingControlUnit
@@ -3,6 +3,7 @@
#include "bsm_socket_handler.h"
#include <utility>
#include <TrainingAreaBase/logger.h>
#include "bsm_telegrams_base.h"
#include "bsm_telegrams_bit_timeout_request.h"
#include "bsm_telegrams_chopped_signal_flash.h"
@@ -3,6 +3,7 @@
#include "bsm_telegrams_base.h"
#include "bsm_telegrams_alive.h"
#include <TrainingAreaBase/logger.h>
#include "bsm_telegrams_bit_timeout_report.h"
#include "bsm_telegrams_direct_fire.h"
#include "bsm_telegrams_sw_version_report.h"
@@ -2,7 +2,7 @@
#include "bsm_telegrams_direct_fire.h"
#include "logger.h"
#include <TrainingAreaBase/logger.h>
#include <QStringBuilder>
namespace BuildingControlUnit