summaryrefslogtreecommitdiffstats
path: root/src/gui/styles
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2010-03-03 13:53:16 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2010-03-03 13:58:05 (GMT)
commit515f6a8c3dbe382bbb4f84f758a61c719143d8a6 (patch)
tree0f43fe3f20d7b2c34b6ac1667db7fdeef9eb6f66 /src/gui/styles
parent4a5eaccce02dbabfd81e8809d453fc268cdba644 (diff)
downloadQt-515f6a8c3dbe382bbb4f84f758a61c719143d8a6.zip
Qt-515f6a8c3dbe382bbb4f84f758a61c719143d8a6.tar.gz
Qt-515f6a8c3dbe382bbb4f84f758a61c719143d8a6.tar.bz2
sizeHint of checkbox/radiobutton without text is not correct
Reviewed-by: Jens Bache-Wiig
Diffstat (limited to 'src/gui/styles')
-rw-r--r--src/gui/styles/qcommonstyle.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp
index f8464cc..b0e2d37 100644
--- a/src/gui/styles/qcommonstyle.cpp
+++ b/src/gui/styles/qcommonstyle.cpp
@@ -4760,7 +4760,7 @@ QSize QCommonStyle::sizeFromContents(ContentsType ct, const QStyleOption *opt,
int margins = 0;
// we add 4 pixels for label margins
- if (btn->icon.isNull() || !btn->text.isEmpty())
+ if (!btn->icon.isNull() || !btn->text.isEmpty())
margins = 4 + proxy()->pixelMetric(isRadio ? PM_RadioButtonLabelSpacing
: PM_CheckBoxLabelSpacing, opt, widget);
sz += QSize(w + margins, 4);