From a3ff1600867192457d128422ad198f97d99cee11 Mon Sep 17 00:00:00 2001 From: berrux_dev Date: Tue, 13 Oct 2026 19:52:58 +0200 Subject: [PATCH] Silence compiler warnings in the release build - Guard the Lts/Viewer include paths with if(EXISTS): the module is outside the release scope, and the unguarded include_directories emitted -Wmissing-include-dirs for every translation unit - nglpdfpage: initialize m_rotation before m_scaleFactor to match the member declaration order (-Wreorder) --- qt6-after/qt6-migrated-legatus/CMakeLists.txt | 8 ++++++-- .../qt6-migrated-legatus/Z/src/nglwidgets/nglpdfpage.cpp | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/qt6-after/qt6-migrated-legatus/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/CMakeLists.txt index 18ec926ae..fb0f5dc80 100755 --- a/qt6-after/qt6-migrated-legatus/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/CMakeLists.txt @@ -88,8 +88,12 @@ include_directories(${CMAKE_SOURCE_DIR}/Z/src) # Include directories for external dependencies and internal modules include_directories(${CMAKE_SOURCE_DIR}/Z/src) include_directories(${CMAKE_SOURCE_DIR}/Z/src/ngltools) -include_directories(${CMAKE_SOURCE_DIR}/Lts/Viewer/SituationMap/Symbology) -include_directories(${CMAKE_SOURCE_DIR}/Lts/Viewer/LtsDataView) +# Lts/Viewer is outside the release scope; only add the include paths when +# present to avoid -Wmissing-include-dirs warnings on validation-scope trees +if(EXISTS "${CMAKE_SOURCE_DIR}/Lts/Viewer/SituationMap/Symbology") + include_directories(${CMAKE_SOURCE_DIR}/Lts/Viewer/SituationMap/Symbology) + include_directories(${CMAKE_SOURCE_DIR}/Lts/Viewer/LtsDataView) +endif() include_directories(${CMAKE_SOURCE_DIR}/Lts/Proxies/TrainingAreaBase) # Release scope: exclude Services, DDS, and Plugins include paths IF(NOT RELEASE_BUILD) diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglpdfpage.cpp b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglpdfpage.cpp index 4da6c58d7..0b081d048 100755 --- a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglpdfpage.cpp +++ b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglpdfpage.cpp @@ -30,8 +30,8 @@ static inline T getRotatedSize(const T &in, Poppler::Page::Rotation rot) PDFPage::PDFPage(QWidget *parent) : QWidget(parent) , m_page(nullptr) - , m_scaleFactor(1.0) , m_rotation(Poppler::Page::Rotate0) + , m_scaleFactor(1.0) { setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); setMouseTracking(true);