diff options
Diffstat (limited to 'src/widgets/widgets/qcombobox_p.h')
| -rw-r--r-- | src/widgets/widgets/qcombobox_p.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/widgets/widgets/qcombobox_p.h b/src/widgets/widgets/qcombobox_p.h index a9d792f07d..68b52aeac2 100644 --- a/src/widgets/widgets/qcombobox_p.h +++ b/src/widgets/widgets/qcombobox_p.h @@ -1,8 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the QtGui module of the Qt Toolkit. ** @@ -35,6 +34,7 @@ ** ** ** +** ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -200,9 +200,7 @@ protected: menuOpt.menuItemType = QStyleOptionMenuItem::Scroller; if (sliderAction == QAbstractSlider::SliderSingleStepAdd) menuOpt.state |= QStyle::State_DownArrow; -#ifndef Q_WS_S60 p.eraseRect(rect()); -#endif style()->drawControl(QStyle::CE_MenuScroller, &menuOpt, &p); } @@ -272,9 +270,7 @@ protected: const QStyleOptionViewItem &option, const QModelIndex &index) const { QStyleOptionMenuItem opt = getStyleOption(option, index); -#ifndef Q_WS_S60 painter->fillRect(option.rect, opt.palette.background()); -#endif mCombo->style()->drawControl(QStyle::CE_MenuItem, &opt, painter, mCombo); } QSize sizeHint(const QStyleOptionViewItem &option, |