diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-13 00:08:11 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-13 00:08:11 (GMT) |
commit | f2b0e6ed97b962f9d6412acaa473f51ba4e23da0 (patch) | |
tree | 5eac3ab5a0c1f2a75c68e6d36472a54014ffbccc /src/gui/styles/qmacstyle_mac.mm | |
parent | f8c06c96b698392bea24f388840dec03274cb14b (diff) | |
parent | a47bf3d15b589414183a0aa51c710c3763d3d1d1 (diff) | |
download | Qt-f2b0e6ed97b962f9d6412acaa473f51ba4e23da0.zip Qt-f2b0e6ed97b962f9d6412acaa473f51ba4e23da0.tar.gz Qt-f2b0e6ed97b962f9d6412acaa473f51ba4e23da0.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui/styles/qmacstyle_mac.mm')
-rw-r--r-- | src/gui/styles/qmacstyle_mac.mm | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm index 64ec29a..5e538cb 100644 --- a/src/gui/styles/qmacstyle_mac.mm +++ b/src/gui/styles/qmacstyle_mac.mm @@ -5274,7 +5274,6 @@ void QMacStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex if (const QStyleOptionToolButton *tb = qstyleoption_cast<const QStyleOptionToolButton *>(opt)) { if (widget && qobject_cast<QToolBar *>(widget->parentWidget())) { -// p->fillRect(tb->rect, QColor(155, 0, 155, 155)); if (tb->subControls & SC_ToolButtonMenu) { QStyleOption arrowOpt(0); arrowOpt.rect = subControlRect(cc, tb, SC_ToolButtonMenu, widget); |