diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-02-05 13:23:54 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-02-05 13:23:54 (GMT) |
| commit | f8fa846bdcd961105674aba3666240b6ed166b04 (patch) | |
| tree | ef2effa1ae84ba43a6bfc06651ba3fe2bf61d8b7 /src/gui/kernel/qwidget.cpp | |
| parent | f9c314aa306bfd4a237594775a8aeb14c858e66d (diff) | |
| parent | b5a5c7ce06291d4f9cae15383bd35677db277138 (diff) | |
| download | Qt-f8fa846bdcd961105674aba3666240b6ed166b04.zip Qt-f8fa846bdcd961105674aba3666240b6ed166b04.tar.gz Qt-f8fa846bdcd961105674aba3666240b6ed166b04.tar.bz2 | |
Merge remote branch 'origin/4.6' into 4.6
Conflicts:
dist/changes-4.6.2
Diffstat (limited to 'src/gui/kernel/qwidget.cpp')
| -rw-r--r-- | src/gui/kernel/qwidget.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 8b8768c..72388f0 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -1670,7 +1670,13 @@ void QWidgetPrivate::syncBackingStore() repaint_sys(dirty); dirty = QRegion(); } else if (QWidgetBackingStore *bs = maybeBackingStore()) { +#ifdef QT_MAC_USE_COCOA + Q_UNUSED(bs); + void qt_mac_set_needs_display(QWidget *, QRegion); + qt_mac_set_needs_display(q_func(), QRegion()); +#else bs->sync(); +#endif } } @@ -1678,8 +1684,15 @@ void QWidgetPrivate::syncBackingStore(const QRegion ®ion) { if (paintOnScreen()) repaint_sys(region); - else if (QWidgetBackingStore *bs = maybeBackingStore()) + else if (QWidgetBackingStore *bs = maybeBackingStore()) { +#ifdef QT_MAC_USE_COCOA + Q_UNUSED(bs); + void qt_mac_set_needs_display(QWidget *, QRegion); + qt_mac_set_needs_display(q_func(), region); +#else bs->sync(q_func(), region); +#endif + } } void QWidgetPrivate::setUpdatesEnabled_helper(bool enable) |