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)
This commit is contained in:
1 parent
42f6e83c2c
commit
a3ff160086
2 files changed
+7
-3
No files matched your search
@@ -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)
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in new issue
Block a user