diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-02-08 08:32:48 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-02-08 08:32:48 (GMT) |
| commit | aa674169ca31b6e296021b3b8f5a448aeecf0973 (patch) | |
| tree | 493f0b7922ac116894a3e7f99833e97984035ccc /src/gui/kernel/qcocoaview_mac.mm | |
| parent | 50a668e62739c715dcd4f001b659ff25f71cc9c4 (diff) | |
| parent | 941b13d52d975069d10093a873cd3a55bb2fd7dd (diff) | |
| download | Qt-aa674169ca31b6e296021b3b8f5a448aeecf0973.zip Qt-aa674169ca31b6e296021b3b8f5a448aeecf0973.tar.gz Qt-aa674169ca31b6e296021b3b8f5a448aeecf0973.tar.bz2 | |
Merge branch '4.6' into qstatictext-4.6
Diffstat (limited to 'src/gui/kernel/qcocoaview_mac.mm')
| -rw-r--r-- | src/gui/kernel/qcocoaview_mac.mm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm index d255604..2c35be2 100644 --- a/src/gui/kernel/qcocoaview_mac.mm +++ b/src/gui/kernel/qcocoaview_mac.mm @@ -520,10 +520,11 @@ extern "C" { - (void)drawRect:(NSRect)aRect { if (QApplicationPrivate::graphicsSystem() != 0) { - if (QWidgetBackingStore *bs = qwidgetprivate->maybeBackingStore()) - bs->markDirty(qwidget->rect(), qwidget); - qwidgetprivate->syncBackingStore(qwidget->rect()); - return; + if (QWidgetBackingStore *bs = qwidgetprivate->maybeBackingStore()) { + // Drawing is handled on the window level + // See qcocoasharedwindowmethods_mac_p. + return; + } } CGContextRef cg = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort]; qwidgetprivate->hd = cg; |