Add BUILD_RTI conditionals for RTI/DDS dependent libraries
Systematic fix for BUILD_RTI conditional compilation: - Lts/Common: Wrap all DDS-dependent libraries in IF(BUILD_RTI) - LtsAppManager, LtsCoordTrans, LtsCoordinate, LtsLogin - LtsMultiMonitor, LtsPluginManager, LtsPrinting - LtsProjectionWorkstation, LtsScriptTimeline, LtsSession - LtsTimelineClassic, LtsUtilsCore, LtsUtilsGui, LtsUtilsGuiDds - Lts/DDS: Add BUILD_RTI guards to Core, DDSConnector, DdsUnitTests, FTC, FTS - Lts/Plugins: Add BUILD_RTI guards to FilterManagement, OperatorManagement, SituationReplayManagement - Lts/Proxies: Add BUILD_RTI guards to Buildings, CombatNetRadio, ComponentMonitor, GuezNasat, TrainingAreaBase, TrainingAreaBaseOC - Lts/Services: Add BUILD_RTI guards to all 30+ service modules - Z/nglwidgets: Add BUILD_RTI guards, fix Poppler Qt6 headers Qt6 compatibility fixes: - LtsCoordTrans: QOverload signal signature, QChar constructor - LtsMultiMonitor: setMargin→setContentsMargins, remove deprecated HighQualityAntialiasing - nglwidgets: Poppler Qt5→Qt6 header migration - Add FindPopplerQt6.cmake for Qt6 Poppler detection Part of Qt5→Qt6 migration with RTI DDS support.
This commit is contained in:
78 files changed
+265
-114
No files matched your search
@@ -27,6 +27,7 @@ SET(LtsMultiMonitor_SRCS
|
||||
lts_screen_wide.cpp
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
NGL_ADD_LIBRARY(WS LtsMultiMonitor SHARED ${LtsMultiMonitor_SRCS})
|
||||
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(LtsMultiMonitor
|
||||
@@ -47,3 +48,4 @@ NGL_TARGET_LINK_LIBRARIES(LtsMultiMonitor
|
||||
)
|
||||
|
||||
NGL_INSTALL_TARGET(LtsMultiMonitor)
|
||||
ENDIF(BUILD_RTI)
|
||||
-1
@@ -283,7 +283,6 @@ void MultiMonitorSelectorBase::drawBase(QPainter &p, bool drawSelector, bool occ
|
||||
|
||||
p.save();
|
||||
p.setRenderHint(QPainter::Antialiasing, true);
|
||||
p.setRenderHint(QPainter::HighQualityAntialiasing, true);
|
||||
|
||||
|
||||
|
||||
|
||||
-1
@@ -242,7 +242,6 @@ void MultiMonitorSelectorWide::paintEvent(QPaintEvent *)
|
||||
p.save();
|
||||
|
||||
p.setRenderHint(QPainter::Antialiasing, true);
|
||||
p.setRenderHint(QPainter::HighQualityAntialiasing, true);
|
||||
|
||||
const QRect centered(centeredRect());
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ LtsScreenContainer::LtsScreenContainer(QRect screenGeo)
|
||||
, m_screenGeo(screenGeo)
|
||||
{
|
||||
|
||||
m_layout->setMargin(0);
|
||||
m_layout->setContentsMargins(0, 0, 0, 0);
|
||||
m_layout->setSpacing(0);
|
||||
m_layout->setStretch(0, 999);
|
||||
|
||||
|
||||
@@ -30,7 +30,6 @@ LtsScreenNormal::LtsScreenNormal(QRect screenGeo, int screenId, bool debugMargin
|
||||
auto *theLayout = new QHBoxLayout;
|
||||
|
||||
theLayout->setContentsMargins(0, 0, 0, 0);
|
||||
theLayout->setMargin(0);
|
||||
theLayout->setSpacing(0);
|
||||
theLayout->setStretch(0, 999);
|
||||
theLayout->addWidget(m_childContainer);
|
||||
|
||||
@@ -32,7 +32,6 @@ LtsScreenWide::LtsScreenWide(const QRect &screenGeo, int screenId, bool debugMar
|
||||
auto *theLayout = new QHBoxLayout;
|
||||
|
||||
theLayout->setContentsMargins(0, 0, 0, 0);
|
||||
theLayout->setMargin(0);
|
||||
theLayout->setSpacing(0);
|
||||
theLayout->setStretch(0, 9999);
|
||||
|
||||
|
||||
Reference in new issue
Block a user