summaryrefslogtreecommitdiffstats
path: root/src/gui/styles/qmotifstyle.cpp
diff options
context:
space:
mode:
authorSarah Smith <sarah.j.smith@nokia.com>2009-09-08 00:35:06 (GMT)
committerSarah Smith <sarah.j.smith@nokia.com>2009-09-08 00:35:06 (GMT)
commit693695e5677422625d555943586d41fbd9dbe971 (patch)
tree17e70dcb11f009398b083cb0361982ca32f2ac6e /src/gui/styles/qmotifstyle.cpp
parentf4fa50c25aea68b7696ad7de289d93facac9f3e5 (diff)
parent4bb098ed9449bd3b2798000bc5394bda98c9165f (diff)
downloadQt-693695e5677422625d555943586d41fbd9dbe971.zip
Qt-693695e5677422625d555943586d41fbd9dbe971.tar.gz
Qt-693695e5677422625d555943586d41fbd9dbe971.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/styles/qmotifstyle.cpp')
-rw-r--r--src/gui/styles/qmotifstyle.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/styles/qmotifstyle.cpp b/src/gui/styles/qmotifstyle.cpp
index 3550408..904a8f56 100644
--- a/src/gui/styles/qmotifstyle.cpp
+++ b/src/gui/styles/qmotifstyle.cpp
@@ -2683,6 +2683,9 @@ QMotifStyle::styleHint(StyleHint hint, const QStyleOption *opt, const QWidget *w
case SH_LineEdit_PasswordCharacter:
ret = '*';
break;
+ case SH_DialogButtonBox_ButtonsHaveIcons:
+ ret = 0;
+ break;
default:
ret = QCommonStyle::styleHint(hint, opt, widget, returnData);
break;