whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Code tidies"

bb10
Zhang Hao 2021-03-13 13:28:57 +08:00 committed by Qt CI Bot
parent 00ee99ac58 a59ab30122
commit 42b0052d97
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/widgets/widgets/qtoolbutton.cpp
View File

@ -244,7 +244,6 @@ void QToolButton::initStyleOption(QStyleOptionToolButton *option) const
Q_D(const QToolButton);
option->initFrom(this);
bool forceNoText = false;
option->iconSize = iconSize(); //default value
#if QT_CONFIG(toolbar)
@ -255,8 +254,7 @@ void QToolButton::initStyleOption(QStyleOptionToolButton *option) const
}
#endif // QT_CONFIG(toolbar)
if (!forceNoText)
option->text = d->text;
option->text = d->text;
option->icon = d->icon;
option->arrowType = d->arrowType;
if (d->down)
@ -308,7 +306,7 @@ void QToolButton::initStyleOption(QStyleOptionToolButton *option) const
option->toolButtonStyle = Qt::ToolButtonIconOnly;
}
if (d->icon.isNull() && d->arrowType == Qt::NoArrow && !forceNoText) {
if (d->icon.isNull() && d->arrowType == Qt::NoArrow) {
if (!d->text.isEmpty())
option->toolButtonStyle = Qt::ToolButtonTextOnly;
else if (option->toolButtonStyle != Qt::ToolButtonTextOnly)