diff options
| author | Christian Ehrlicher <[email protected]> | 2023-10-08 12:33:06 +0200 |
|---|---|---|
| committer | Christian Ehrlicher <[email protected]> | 2023-10-11 21:53:26 +0200 |
| commit | 217c607782490344f08fff5d30affbb0db7fa3a8 (patch) | |
| tree | 6fcd036df846580a4a8cec32f0fe014a5495e845 | |
| parent | 60cff8e9aaea929aa97bcaaa515ba25502730e00 (diff) | |
Widgets: pass QWidget pointer to standardIcon/Pixmap() if available
Pass the pointer to the QWidget the icon is painted on to
QStyle::standardIcon/Pixmap().
Change-Id: If9dbc3acb621fb60152f2e12fc0080f354397a99
Reviewed-by: Volker Hilsheimer <[email protected]>
| -rw-r--r-- | src/widgets/dialogs/qerrormessage.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/widgets/qcommandlinkbutton.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/widgets/qtoolbarextension.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/dialogs/qerrormessage.cpp b/src/widgets/dialogs/qerrormessage.cpp index 5a6d529fc2b..06b99bb296a 100644 --- a/src/widgets/dialogs/qerrormessage.cpp +++ b/src/widgets/dialogs/qerrormessage.cpp @@ -257,7 +257,7 @@ QErrorMessage::QErrorMessage(QWidget * parent) grid->setRowStretch(0, 42); #if QT_CONFIG(messagebox) - d->icon->setPixmap(style()->standardPixmap(QStyle::SP_MessageBoxInformation)); + d->icon->setPixmap(style()->standardPixmap(QStyle::SP_MessageBoxInformation, nullptr, this)); d->icon->setAlignment(Qt::AlignHCenter | Qt::AlignTop); #endif d->again->setChecked(true); diff --git a/src/widgets/widgets/qcommandlinkbutton.cpp b/src/widgets/widgets/qcommandlinkbutton.cpp index 2c59e78c1ad..9232d481f45 100644 --- a/src/widgets/widgets/qcommandlinkbutton.cpp +++ b/src/widgets/widgets/qcommandlinkbutton.cpp @@ -189,7 +189,7 @@ void QCommandLinkButtonPrivate::init() q->setIconSize(QSize(20, 20)); QStyleOptionButton opt; q->initStyleOption(&opt); - q->setIcon(q->style()->standardIcon(QStyle::SP_CommandLink, &opt)); + q->setIcon(q->style()->standardIcon(QStyle::SP_CommandLink, &opt, q)); } // Calculates the height of the description text based on widget width diff --git a/src/widgets/widgets/qtoolbarextension.cpp b/src/widgets/widgets/qtoolbarextension.cpp index 9df3cfbda02..069ac0f1658 100644 --- a/src/widgets/widgets/qtoolbarextension.cpp +++ b/src/widgets/widgets/qtoolbarextension.cpp @@ -27,9 +27,9 @@ void QToolBarExtension::setOrientation(Qt::Orientation o) QStyleOption opt; opt.initFrom(this); if (o == Qt::Horizontal) { - setIcon(style()->standardIcon(QStyle::SP_ToolBarHorizontalExtensionButton, &opt)); + setIcon(style()->standardIcon(QStyle::SP_ToolBarHorizontalExtensionButton, &opt, this)); } else { - setIcon(style()->standardIcon(QStyle::SP_ToolBarVerticalExtensionButton, &opt)); + setIcon(style()->standardIcon(QStyle::SP_ToolBarVerticalExtensionButton, &opt, this)); } m_orientation = o; } |