diff options
| author | Jens Bache-Wiig <jens.bache-wiig@nokia.com> | 2010-09-01 12:05:05 (GMT) |
|---|---|---|
| committer | Jens Bache-Wiig <jens.bache-wiig@nokia.com> | 2010-09-01 12:05:05 (GMT) |
| commit | e09778c7f3ef8a2272ab7dd18d00619e456fa84b (patch) | |
| tree | becda543006166004aa66f75242143747113ceda | |
| parent | 6cef5c7ea08195bb801673fee99c79847ce2e1ef (diff) | |
| download | Qt-e09778c7f3ef8a2272ab7dd18d00619e456fa84b.zip Qt-e09778c7f3ef8a2272ab7dd18d00619e456fa84b.tar.gz Qt-e09778c7f3ef8a2272ab7dd18d00619e456fa84b.tar.bz2 | |
Align icon positions when using TextUnderIcon for tool buttons
The widget would explicitly ignore the TextUnderIcon flag if no text
was set. This is wrong because it should be up to the style to decide
such details and the end result are unaligned icons by default.
Task-number: QTBUG-3715
Reviewed-by: richard
| -rw-r--r-- | src/gui/widgets/qtoolbutton.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/gui/widgets/qtoolbutton.cpp b/src/gui/widgets/qtoolbutton.cpp index 1822db8..c18f660 100644 --- a/src/gui/widgets/qtoolbutton.cpp +++ b/src/gui/widgets/qtoolbutton.cpp @@ -394,9 +394,6 @@ void QToolButton::initStyleOption(QStyleOptionToolButton *option) const option->toolButtonStyle = Qt::ToolButtonTextOnly; else if (option->toolButtonStyle != Qt::ToolButtonTextOnly) option->toolButtonStyle = Qt::ToolButtonIconOnly; - } else { - if (d->text.isEmpty() && option->toolButtonStyle != Qt::ToolButtonIconOnly) - option->toolButtonStyle = Qt::ToolButtonIconOnly; } option->pos = pos(); |