diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-06-28 14:30:13 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-06-28 14:30:13 (GMT) |
| commit | 547c4f657991b47f8840b08c25d86d4abc180313 (patch) | |
| tree | e339dc19a662db6ee87a14f9a53a942b36dba696 /src/gui/kernel | |
| parent | ec896e15bdc2b8c71a8e200faae3b4ecf429964a (diff) | |
| parent | a9177328bcac8960ebb19be7b709faaa216ee9d3 (diff) | |
| download | Qt-547c4f657991b47f8840b08c25d86d4abc180313.zip Qt-547c4f657991b47f8840b08c25d86d4abc180313.tar.gz Qt-547c4f657991b47f8840b08c25d86d4abc180313.tar.bz2 | |
Merge branch '4.5'
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qwidget_mac.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index 825c797..a9097a2 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -3691,7 +3691,7 @@ static void qt_mac_update_widget_posisiton(QWidget *q, QRect oldRect, QRect newR // Perform a normal (complete repaint) update in some cases: if ( // move-by-scroll requires QWidgetPrivate::isOpaque set - (isMove && qd->isOpaque == false) || + (isMove && q->testAttribute(Qt::WA_OpaquePaintEvent) == false) || // limited update on resize requires WA_StaticContents. (isResize && q->testAttribute(Qt::WA_StaticContents) == false) || @@ -4215,7 +4215,7 @@ void QWidgetPrivate::scroll_sys(int dx, int dy, const QRect &r) HIRect bounds = CGRectMake(w->data->crect.x(), w->data->crect.y(), w->data->crect.width(), w->data->crect.height()); HIViewRef hiview = qt_mac_nativeview_for(w); - const bool opaque = qt_widget_private(w)->isOpaque; + const bool opaque = q->testAttribute(Qt::WA_OpaquePaintEvent); if (opaque) HIViewSetDrawingEnabled(hiview, false); |