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
@@ -47,6 +47,7 @@ NGL_TARGET_LINK_LIBRARIES(ltsCoordWidget
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(ltsCoordWidget
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../LtsUtils/LtsUtilsCore
|
||||
)
|
||||
|
||||
IF(TARGET LtsCoordTrans)
|
||||
|
||||
@@ -40,7 +40,7 @@ MgrsEdit::MgrsEdit(int precision, QWidget *widget)
|
||||
m_ui->leNorth->setValidator(new QIntValidator(0, upperLimit, m_ui->leNorth));
|
||||
setDefaultMgrsSquares();
|
||||
|
||||
connect(m_ui->cbxZone, QOverload<const QString &>::of(&QComboBox::currentIndexChanged),
|
||||
connect(m_ui->cbxZone, QOverload<int>::of(&QComboBox::currentIndexChanged),
|
||||
this, &MgrsEdit::onCoordinateDataChanged);
|
||||
connect(m_ui->leEast, &QLineEdit::editingFinished,
|
||||
this, &MgrsEdit::onCoordinateDataChanged);
|
||||
@@ -314,7 +314,7 @@ QValidator::State DoubleValidator::validate(QString &input, int &pos) const
|
||||
if (ret != QValidator::Acceptable)
|
||||
return ret;
|
||||
QLocale l;
|
||||
const QChar gs(l.groupSeparator());
|
||||
const QChar gs = l.groupSeparator().at(0);
|
||||
if (gs.isNull())
|
||||
return ret;
|
||||
if (input.contains(gs))
|
||||
|
||||
Reference in new issue
Block a user