diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-05-18 17:10:34 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-05-19 14:22:40 +0000 |
| commit | 4f9e977cdacd672724bfa615e6b7b18363c8c24c (patch) | |
| tree | 04895d2375ce59551393b51752f6801c822eed04 /src/imports | |
| parent | 2f71cc0e9988052f6a072d55072b152627e24588 (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.
Pick-to: 6.1
Change-Id: Id17c95314f4adfa48e7754120ecc36a2efac5403
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports')
| -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 155915c1..4a23039a 100644 --- a/src/imports/nativestyle/qstyle/qquickcommonstyle.cpp +++ b/src/imports/nativestyle/qstyle/qquickcommonstyle.cpp @@ -5642,7 +5642,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); @@ -5660,7 +5660,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); |