Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp
	src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.h

Change-Id: I1e6a9424e7f87d9e4ac1ea387ec70e151106f1c7

1 files changed, 20 insertions, 26 deletions

diff --git a/tests/auto/quick/scenegraph/tst_scenegraph.cpp b/tests/auto/quick/scenegraph/tst_scenegraph.cpp
index 1cca56a876..1e46727526 100644
--- a/tests/auto/quick/scenegraph/tst_scenegraph.cpp
+++ b/tests/auto/quick/scenegraph/tst_scenegraph.cpp
@@ -39,6 +39,7 @@
 #include <private/qsgcontext_p.h>
 #include <private/qsgrenderloop_p.h>
 
+#include "../../shared/util.h"
 
 class PerPixelRect : public QQuickItem
 {
@@ -84,7 +85,7 @@ private:
     QColor m_color;
 };
 
-class tst_SceneGraph : public QObject
+class tst_SceneGraph : public QQmlDataTest
 {
     Q_OBJECT
 
@@ -104,6 +105,7 @@ private slots:
 
 private:
     bool m_brokenMipmapSupport;
+    QQuickView *createView(const QString &file, QWindow *parent = 0, int x = -1, int y = -1, int w = -1, int h = -1);
 };
 
 template <typename T> class ScopedList : public QList<T> {
@@ -115,6 +117,8 @@ void tst_SceneGraph::initTestCase()
 {
     qmlRegisterType<PerPixelRect>("SceneGraphTest", 1, 0, "PerPixelRect");
 
+    QQmlDataTest::initTestCase();
+
     QSGRenderLoop *loop = QSGRenderLoop::instance();
     qDebug() << "RenderLoop:        " << loop;
 
@@ -152,26 +156,16 @@ void tst_SceneGraph::initTestCase()
     context.doneCurrent();
 }
 
-QQuickView *createView(const QString &file, QWindow *parent = 0, int x = -1, int y = -1, int w = -1, int h = -1)
+QQuickView *tst_SceneGraph::createView(const QString &file, QWindow *parent, int x, int y, int w, int h)
 {
     QQuickView *view = new QQuickView(parent);
-    view->setSource(QUrl::fromLocalFile("data/" + file));
+    view->setSource(testFileUrl(file));
     if (x >= 0 && y >= 0) view->setPosition(x, y);
     if (w >= 0 && h >= 0) view->resize(w, h);
     view->show();
     return view;
 }
 
-QImage showAndGrab(const QString &file, int w, int h)
-{
-    QQuickView view;
-    view.setSource(QUrl::fromLocalFile(QStringLiteral("data/") + file));
-    if (w >= 0 && h >= 0)
-        view.resize(w, h);
-    view.create();
-    return view.grabWindow();
-}
-
 // Assumes the images are opaque white...
 bool containsSomethingOtherThanWhite(const QImage &image)
 {
@@ -405,17 +399,17 @@ void tst_SceneGraph::render_data()
     QTest::addColumn<QList<Sample> >("finalStage");
 
     QList<QString> files;
-    files << "data/render_DrawSets.qml"
-          << "data/render_Overlap.qml"
-          << "data/render_MovingOverlap.qml"
-          << "data/render_BreakOpacityBatch.qml"
-          << "data/render_OutOfFloatRange.qml"
-          << "data/render_StackingOrder.qml"
-          << "data/render_ImageFiltering.qml"
-          << "data/render_bug37422.qml"
-          << "data/render_OpacityThroughBatchRoot.qml";
+    files << "render_DrawSets.qml"
+          << "render_Overlap.qml"
+          << "render_MovingOverlap.qml"
+          << "render_BreakOpacityBatch.qml"
+          << "render_OutOfFloatRange.qml"
+          << "render_StackingOrder.qml"
+          << "render_ImageFiltering.qml"
+          << "render_bug37422.qml"
+          << "render_OpacityThroughBatchRoot.qml";
     if (!m_brokenMipmapSupport)
-          files << "data/render_Mipmap.qml";
+          files << "render_Mipmap.qml";
 
     QRegExp sampleCount("#samples: *(\\d+)");
     //                          X:int   Y:int   R:float       G:float       B:float       Error:float
@@ -423,7 +417,7 @@ void tst_SceneGraph::render_data()
     QRegExp finalSamples("#final: *(\\d+) *(\\d+) *(\\d\\.\\d+) *(\\d\\.\\d+) *(\\d\\.\\d+) *(\\d\\.\\d+)");
 
     foreach (QString fileName, files) {
-        QFile file(fileName);
+        QFile file(testFile(fileName));
         if (!file.open(QFile::ReadOnly)) {
             qFatal("render_data: QFile::open failed! file=%s, error=%s",
                    qPrintable(fileName), qPrintable(file.errorString()));
@@ -466,7 +460,7 @@ void tst_SceneGraph::render()
 
     QQuickView view;
     view.rootContext()->setContextProperty("suite", &suite);
-    view.setSource(QUrl::fromLocalFile(file));
+    view.setSource(testFileUrl(file));
     view.setResizeMode(QQuickView::SizeViewToRootObject);
     view.show();
     QVERIFY(QTest::qWaitForWindowExposed(&view));
@@ -514,7 +508,7 @@ void tst_SceneGraph::hideWithOtherContext()
 
     {
         QQuickView view;
-        view.setSource(QUrl::fromLocalFile("data/simple.qml"));
+        view.setSource(testFileUrl("simple.qml"));
         view.setResizeMode(QQuickView::SizeViewToRootObject);
         view.show();
         QVERIFY(QTest::qWaitForWindowExposed(&view));