Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	src/network/access/qhttpthreaddelegate.cpp

Change-Id: Ia15372687c93cd585967b006c0baaac3a5f29e91

1 files changed, 4 insertions, 1 deletions

diff --git a/src/plugins/platforms/android/qandroidplatformrasterwindow.cpp b/src/plugins/platforms/android/qandroidplatformrasterwindow.cpp
index 68545c6562..334b9cdd23 100644
--- a/src/plugins/platforms/android/qandroidplatformrasterwindow.cpp
+++ b/src/plugins/platforms/android/qandroidplatformrasterwindow.cpp
@@ -54,6 +54,9 @@ QAndroidPlatformRasterWindow::QAndroidPlatformRasterWindow(QWindow *window)
 
 void QAndroidPlatformRasterWindow::repaint(const QRegion &region)
 {
+    if (QAndroidPlatformWindow::parent())
+        return;
+
     QRect currentGeometry = geometry().translated(mapToGlobal(QPoint(0,0)));
 
     QRect dirtyClient = region.boundingRect();
@@ -71,7 +74,7 @@ void QAndroidPlatformRasterWindow::repaint(const QRegion &region)
 
 void QAndroidPlatformRasterWindow::setGeometry(const QRect &rect)
 {
-    m_oldGeometry = geometry();
+    m_oldGeometry = geometry().translated(mapToGlobal(QPoint(0,0)));;
     QAndroidPlatformWindow::setGeometry(rect);
 }