diff options
| author | Derick Hawcroft <derick.hawcroft@nokia.com> | 2009-11-05 00:22:11 (GMT) |
|---|---|---|
| committer | Derick Hawcroft <derick.hawcroft@nokia.com> | 2009-11-05 00:22:11 (GMT) |
| commit | 5906504ec0aefed858d63c38fd17f5ec61743e96 (patch) | |
| tree | b1ea3437aa6541f1114374924260fd29d38c2c9d /src | |
| parent | 829f617ab2d4f240950ce88e9ce97421a2939a74 (diff) | |
| parent | 8325c15b21cd49287160c8dfb31ebf56ba3090ab (diff) | |
| download | Qt-5906504ec0aefed858d63c38fd17f5ec61743e96.zip Qt-5906504ec0aefed858d63c38fd17f5ec61743e96.tar.gz Qt-5906504ec0aefed858d63c38fd17f5ec61743e96.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/accessible/qaccessible_mac.mm | 5 | ||||
| -rw-r--r-- | src/gui/kernel/qwidget_mac.mm | 6 |
2 files changed, 3 insertions, 8 deletions
diff --git a/src/gui/accessible/qaccessible_mac.mm b/src/gui/accessible/qaccessible_mac.mm index 46ef1e5..a875a5c 100644 --- a/src/gui/accessible/qaccessible_mac.mm +++ b/src/gui/accessible/qaccessible_mac.mm @@ -504,11 +504,6 @@ QAElement::QAElement(const QAElement &element) } QAElement::QAElement(HIObjectRef object, int child) - :elementRef( -#ifndef QT_MAC_USE_COCOA - AXUIElementCreateWithHIObjectAndIdentifier(object, child) -#endif -) { #ifndef QT_MAC_USE_COCOA if (object == 0) { diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index db11815..89f2d02 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -3756,7 +3756,7 @@ void QWidgetPrivate::stackUnder_sys(QWidget *w) /* Modifies the bounds for a widgets backing HIView during moves and resizes. Also updates the widget, either by scrolling its contents or repainting, depending on the WA_StaticContents - and QWidgetPrivate::isOpaque flags. + flag */ static void qt_mac_update_widget_posisiton(QWidget *q, QRect oldRect, QRect newRect) { @@ -3773,8 +3773,8 @@ 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 && q->testAttribute(Qt::WA_OpaquePaintEvent) == false) || + // always repaint on move. + (isMove) || // limited update on resize requires WA_StaticContents. (isResize && q->testAttribute(Qt::WA_StaticContents) == false) || |