Merge branch 'stable' into dev

Conflicts:
	src/qml/debugger/qv8debugservice.cpp
	src/qml/qml/v8/qv8engine.cpp
	tests/auto/quick/qquickitem/qquickitem.pro

Change-Id: Ic4a1dcdd8b8a84155d2f2abefdf1da5c3a56af31

2 files changed, 29 insertions, 2 deletions

diff --git a/tests/auto/quick/shared/viewtestutil.cpp b/tests/auto/quick/shared/viewtestutil.cpp
index 29b82072c9..0e3964d52d 100644
--- a/tests/auto/quick/shared/viewtestutil.cpp
+++ b/tests/auto/quick/shared/viewtestutil.cpp
@@ -42,17 +42,41 @@
 #include "viewtestutil.h"
 
 #include <QtQuick/QQuickView>
+#include <QtQuick/QQuickView>
+#include <QtGui/QScreen>
 
 #include <QtTest/QTest>
 
 QQuickView *QQuickViewTestUtil::createView()
 {
     QQuickView *window = new QQuickView(0);
-    window->setGeometry(0,0,240,320);
-
+    const QSize size(240, 320);
+    window->resize(size);
+    QQuickViewTestUtil::centerOnScreen(window, size);
     return window;
 }
 
+void QQuickViewTestUtil::centerOnScreen(QQuickView *window, const QSize &size)
+{
+    const QRect screenGeometry = window->screen()->availableGeometry();
+    const QPoint offset = QPoint(size.width() / 2, size.height() / 2);
+    window->setFramePosition(screenGeometry.center() - offset);
+}
+
+void QQuickViewTestUtil::centerOnScreen(QQuickView *window)
+{
+    QQuickViewTestUtil::centerOnScreen(window, window->size());
+}
+
+void QQuickViewTestUtil::moveMouseAway(QQuickView *window)
+{
+#ifndef QT_NO_CURSOR // Get the cursor out of the way.
+    QCursor::setPos(window->geometry().topRight() + QPoint(100, 100));
+#else
+    Q_UNUSED(window)
+#endif
+}
+
 void QQuickViewTestUtil::flick(QQuickView *window, const QPoint &from, const QPoint &to, int duration)
 {
     const int pointCount = 5;
diff --git a/tests/auto/quick/shared/viewtestutil.h b/tests/auto/quick/shared/viewtestutil.h
index 67906114f6..5b0b10b69c 100644
--- a/tests/auto/quick/shared/viewtestutil.h
+++ b/tests/auto/quick/shared/viewtestutil.h
@@ -53,6 +53,9 @@ namespace QQuickViewTestUtil
     QQuickView *createView();
 
     void flick(QQuickView *window, const QPoint &from, const QPoint &to, int duration);
+    void centerOnScreen(QQuickView *window, const QSize &size);
+    void centerOnScreen(QQuickView *window);
+    void moveMouseAway(QQuickView *window);
 
     QList<int> adjustIndexesForAddDisplaced(const QList<int> &indexes, int index, int count);
     QList<int> adjustIndexesForMove(const QList<int> &indexes, int from, int to, int count);