diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-23 06:51:56 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-23 06:51:56 (GMT) |
| commit | 369afa4bcee7addbf1a7e8556cf0b521bb75c57d (patch) | |
| tree | 11fc05b6aa85397d0384a14917c07bb3c0d964cf /src/gui/kernel | |
| parent | 91c1ec98c10d8ce89932f7df69e3de33d80beeff (diff) | |
| parent | 0873efff5197cb92bce378c67cd744753f809bae (diff) | |
| download | Qt-369afa4bcee7addbf1a7e8556cf0b521bb75c57d.zip Qt-369afa4bcee7addbf1a7e8556cf0b521bb75c57d.tar.gz Qt-369afa4bcee7addbf1a7e8556cf0b521bb75c57d.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qt_s60_p.h | 8 | ||||
| -rw-r--r-- | src/gui/kernel/qwidget.cpp | 10 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/gui/kernel/qt_s60_p.h b/src/gui/kernel/qt_s60_p.h index b43c950..aa39f9d 100644 --- a/src/gui/kernel/qt_s60_p.h +++ b/src/gui/kernel/qt_s60_p.h @@ -101,11 +101,11 @@ public: int virtualMouseAccel; int virtualMouseMaxAccel; #ifndef Q_SYMBIAN_FIXED_POINTER_CURSORS - bool brokenPointerCursors; + int brokenPointerCursors : 1; #endif - bool hasTouchscreen; - bool mouseInteractionEnabled; - bool virtualMouseRequired; + int hasTouchscreen : 1; + int mouseInteractionEnabled : 1; + int virtualMouseRequired : 1; int qtOwnsS60Environment : 1; static inline void updateScreenSize(); static inline RWsSession& wsSession(); diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index e68a72d..6f5781c 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -2106,6 +2106,13 @@ static inline void fillRegion(QPainter *painter, const QRegion &rgn, const QBrus painter->drawTiledPixmap(rect, brush.texture(), rect.topLeft()); } #endif // Q_WS_MAC + + } else if (brush.gradient() + && brush.gradient()->coordinateMode() == QGradient::ObjectBoundingMode) { + painter->save(); + painter->setClipRegion(rgn); + painter->fillRect(0, 0, painter->device()->width(), painter->device()->height(), brush); + painter->restore(); } else { const QVector<QRect> &rects = rgn.rects(); for (int i = 0; i < rects.size(); ++i) @@ -2146,7 +2153,6 @@ void QWidgetPrivate::paintBackground(QPainter *painter, const QRegion &rgn, int if (q->autoFillBackground()) fillRegion(painter, rgn, autoFillBrush); - if (q->testAttribute(Qt::WA_StyledBackground)) { painter->setClipRegion(rgn); QStyleOption opt; @@ -4991,7 +4997,7 @@ QGraphicsEffect *QWidget::graphicsEffect() const /*! \brief The setGraphicsEffect function is for setting the widget's graphics effect. - + Sets \a effect as the widget's effect. If there already is an effect installed on this widget, QWidget will delete the existing effect before installing the new \a effect. |