diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-05-18 17:10:34 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-05-19 20:11:38 +0000 |
| commit | d4ae7890a0f12ae7ce5a3216984858de37cc3c71 (patch) | |
| tree | b5adbcd010c662f3e824d2c593b8ca4a715cad01 /src | |
| parent | 058a3accfb2a314ca628075b4c376e321d89f3ce (diff) | |
Don't access QStyleOption* without checking for nullptr first
It can be nullptr as per the preamble to the function, and the fact that the
parameter defaults to nullptr.
Addresses code checker report 723994a37c58a4dcc3aeb573e1d517c5.
Change-Id: Id17c95314f4adfa48e7754120ecc36a2efac5403
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit 4f9e977cdacd672724bfa615e6b7b18363c8c24c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/nativestyle/qstyle/qquickcommonstyle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/nativestyle/qstyle/qquickcommonstyle.cpp b/src/imports/nativestyle/qstyle/qquickcommonstyle.cpp index e4adebd9..24065353 100644 --- a/src/imports/nativestyle/qstyle/qquickcommonstyle.cpp +++ b/src/imports/nativestyle/qstyle/qquickcommonstyle.cpp @@ -5643,7 +5643,7 @@ QIcon QCommonStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption if (!linkIcon.isNull()) { QIcon baseIcon = QCommonStyle::standardIcon(SP_FileIcon, option); const QList<QSize> sizes = baseIcon.availableSizes(QIcon::Normal, QIcon::Off); - const qreal devicePixelRatio = dpr(option->window); + const qreal devicePixelRatio = option ? dpr(option->window) : 1.; for (int i = 0 ; i < sizes.size() ; ++i) { int size = sizes[i].width(); QPixmap basePixmap = baseIcon.pixmap(QSize(size, size), devicePixelRatio); @@ -5661,7 +5661,7 @@ QIcon QCommonStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption if (!linkIcon.isNull()) { QIcon baseIcon = QCommonStyle::standardIcon(SP_DirIcon, option); const QList<QSize> sizes = baseIcon.availableSizes(QIcon::Normal, QIcon::Off); - const qreal devicePixelRatio = dpr(option->window); + const qreal devicePixelRatio = option ? dpr(option->window) : 1.; for (int i = 0 ; i < sizes.size() ; ++i) { int size = sizes[i].width(); QPixmap basePixmap = baseIcon.pixmap(QSize(size, size), devicePixelRatio); |