Skip to content

Commit 5906504

Browse files
author
Derick Hawcroft
committed
Merge branch '4.5' of [email protected]:qt/qt into 4.5
2 parents 829f617 + 8325c15 commit 5906504

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

src/gui/accessible/qaccessible_mac.mm

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -504,11 +504,6 @@ uint qHash(const QAInterface &item)
504504
}
505505

506506
QAElement::QAElement(HIObjectRef object, int child)
507-
:elementRef(
508-
#ifndef QT_MAC_USE_COCOA
509-
AXUIElementCreateWithHIObjectAndIdentifier(object, child)
510-
#endif
511-
)
512507
{
513508
#ifndef QT_MAC_USE_COCOA
514509
if (object == 0) {

src/gui/kernel/qwidget_mac.mm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3756,7 +3756,7 @@ QRect orect(geometry().x(), geometry().y(), width(), height()),
37563756
/*
37573757
Modifies the bounds for a widgets backing HIView during moves and resizes. Also updates the
37583758
widget, either by scrolling its contents or repainting, depending on the WA_StaticContents
3759-
and QWidgetPrivate::isOpaque flags.
3759+
flag
37603760
*/
37613761
static void qt_mac_update_widget_posisiton(QWidget *q, QRect oldRect, QRect newRect)
37623762
{
@@ -3773,8 +3773,8 @@ static void qt_mac_update_widget_posisiton(QWidget *q, QRect oldRect, QRect newR
37733773

37743774
// Perform a normal (complete repaint) update in some cases:
37753775
if (
3776-
// move-by-scroll requires QWidgetPrivate::isOpaque set
3777-
(isMove && q->testAttribute(Qt::WA_OpaquePaintEvent) == false) ||
3776+
// always repaint on move.
3777+
(isMove) ||
37783778

37793779
// limited update on resize requires WA_StaticContents.
37803780
(isResize && q->testAttribute(Qt::WA_StaticContents) == false) ||

0 commit comments

Comments
 (0)