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:
30 files changed
+376
-247
No files matched your search
@@ -40,7 +40,9 @@
|
||||
#include <LtsWidgets/lts_tab_widget.h>
|
||||
#include <PluginInterfaces/data_plugin_interface.h>
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#ifdef BUILD_FILTERMANAGEMENT
|
||||
// Complete type needed for dynamic_pointer_cast of m_ohvIfc (BUILD_RTI code below);
|
||||
// the header is self-contained (Qt only), the FilterManagement plugin is only the implementor.
|
||||
#ifdef BUILD_RTI
|
||||
#include <Lts/Plugins/OnlineHelp/ohp_online_help_viewer_gui_plugin_interface.h> // XXX: grrr..
|
||||
#endif
|
||||
#include <QtWidgets/QApplication>
|
||||
@@ -156,7 +158,7 @@ QString LtsSession::toString() const
|
||||
str.append(QStringLiteral(", workspaceId='%1'").arg(workspaceId()));
|
||||
#ifdef BUILD_RTI
|
||||
str.append(QStringLiteral(", appToString='%1'").arg(appToString(app())));
|
||||
str.append(QStringLiteral(", partitionType=%1, exerciseId='%2'").arg(partitionType()).arg(exerciseId()));
|
||||
str.append(QStringLiteral(", partitionType=%1, exerciseId='%2'").arg(static_cast<int>(partitionType())).arg(exerciseId()));
|
||||
str.append(QStringLiteral(", LtsSessionDataDds=%1").arg(LtsSessionDataDds::toString()));
|
||||
#else
|
||||
str.append(QStringLiteral(", app=Login (stub)"));
|
||||
|
||||
Reference in new issue
Block a user