Merge branch 'wip/qtquickintegration' into dev

 Conflicts:
	src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
	src/render/backend/triangleboundingvolume.cpp
	src/render/backend/triangleboundingvolume_p.h
	src/render/frontend/qrenderaspect.cpp
	src/render/frontend/sphere.cpp
	src/render/frontend/sphere_p.h
	src/render/jobs/pickboundingvolumejob.cpp
	src/render/jobs/pickboundingvolumejob_p.h
	src/render/picking/objectpicker.cpp
	src/render/raycasting/qcollisionqueryresult_p.h
	src/render/render.pro
	src/src.pro
	tests/auto/render/objectpicker/tst_objectpicker.cpp
	tests/auto/render/render.pro

Change-Id: I95717c7855887850d5c90e7ad8f19f1ffb37a545

2 files changed, 6 insertions, 0 deletions

diff --git a/tests/auto/render/commons/testrenderer.cpp b/tests/auto/render/commons/testrenderer.cpp
index 87e60a263..f318797ca 100644
--- a/tests/auto/render/commons/testrenderer.cpp
+++ b/tests/auto/render/commons/testrenderer.cpp
@@ -76,4 +76,9 @@ QSurfaceFormat TestRenderer::format()
     return QSurfaceFormat();
 }
 
+QOpenGLContext *TestRenderer::shareContext() const
+{
+    return nullptr;
+}
+
 QT_END_NAMESPACE
diff --git a/tests/auto/render/commons/testrenderer.h b/tests/auto/render/commons/testrenderer.h
index 2e572582e..ecbec4aa3 100644
--- a/tests/auto/render/commons/testrenderer.h
+++ b/tests/auto/render/commons/testrenderer.h
@@ -74,6 +74,7 @@ public:
 
     void resetDirty();
     QVariant executeCommand(const QStringList &args) Q_DECL_OVERRIDE;
+    QOpenGLContext *shareContext() const Q_DECL_OVERRIDE;
 
     void setOffscreenSurfaceHelper(Qt3DRender::Render::OffscreenSurfaceHelper *helper) Q_DECL_OVERRIDE;
     QSurfaceFormat format() Q_DECL_OVERRIDE;