Merge commit 'origin/4.5' into origin/4.6

Conflicts:
	src/gui/kernel/qcocoaview_mac.mm
	src/network/access/qhttpnetworkconnection.cpp
	src/opengl/qgl_qws.cpp
	src/opengl/qglpixelbuffer_egl.cpp

1 files changed, 1 insertions, 1 deletions

diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp
index 13a1662..d91cedd 100644
--- a/src/gui/itemviews/qabstractitemview.cpp
+++ b/src/gui/itemviews/qabstractitemview.cpp
@@ -3029,7 +3029,7 @@ void QAbstractItemView::update(const QModelIndex &index)
         //this test is important for peformance reason
         //For example in dataChanged we simply update all the cells without checking
         //it can be a major bottleneck to update rects that aren't even part of the viewport
-        if (d->viewport->geometry().intersects(rect))
+        if (d->viewport->rect().intersects(rect))
             d->viewport->update(rect);
     }
 }