diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-02-24 13:30:02 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-02-25 01:33:10 +0000 |
| commit | b3182755bd208730ab23bc6250bbc090aafbb8e1 (patch) | |
| tree | 985395047b88c34be1bd30b78d20b882853696f0 /src | |
| parent | 2ef9fe42d1d21bb3218945d178c6d69547b27c6d (diff) | |
Consistently test for nullptr
m_view might be nullptr, which is checked before setting up the palette,
so don't set the QTextCharFormat up without checking first as well.
Fixes static analyzer warning 0ef07dd07bebe04b93d1fc802eddb57a
Change-Id: Ia1c92eb4183c9e368e92875775cff90e2883ddaf
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit e38b55c47ce95480e6d0c1eb9d795cebc4d28c04)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/widgets/widgets/qcalendarwidget.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/widgets/widgets/qcalendarwidget.cpp b/src/widgets/widgets/qcalendarwidget.cpp index 4ceb85e9bf..5f35b85044 100644 --- a/src/widgets/widgets/qcalendarwidget.cpp +++ b/src/widgets/widgets/qcalendarwidget.cpp @@ -1111,16 +1111,17 @@ QTextCharFormat QCalendarModel::formatForCell(int row, int col) const { QPalette pal; QPalette::ColorGroup cg = QPalette::Active; + QTextCharFormat format; + if (m_view) { pal = m_view->palette(); if (!m_view->isEnabled()) cg = QPalette::Disabled; else if (!m_view->isActiveWindow()) cg = QPalette::Inactive; + format.setFont(m_view->font()); } - QTextCharFormat format; - format.setFont(m_view->font()); bool header = (m_weekNumbersShown && col == HeaderColumn) || (m_horizontalHeaderFormat != QCalendarWidget::NoHorizontalHeader && row == HeaderRow); format.setBackground(pal.brush(cg, header ? QPalette::AlternateBase : QPalette::Base)); |