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

 Conflicts:
	.qmake.conf

Change-Id: Ie8a4bf768bffba61dca9e315151c035be7b48723

3 files changed, 45 insertions, 2 deletions

diff --git a/tests/auto/render/qrendercapture/tst_qrendercapture.cpp b/tests/auto/render/qrendercapture/tst_qrendercapture.cpp
index b2144d500..2fab1e837 100644
--- a/tests/auto/render/qrendercapture/tst_qrendercapture.cpp
+++ b/tests/auto/render/qrendercapture/tst_qrendercapture.cpp
@@ -34,6 +34,8 @@
 #include <Qt3DRender/QRenderCapture>
 #include <Qt3DRender/private/qrendercapture_p.h>
 
+#include <QPointer>
+
 #include "testpostmanarbiter.h"
 
 class MyRenderCapture : public Qt3DRender::QRenderCapture
@@ -129,6 +131,23 @@ private Q_SLOTS:
         // THEN
         renderCapture->sceneChangeEvent(e); // Should not reset
     }
+
+    void crashOnRenderCaptureDeletion()
+    {
+        // GIVEN
+        QScopedPointer<Qt3DRender::QRenderCapture> renderCapture(new Qt3DRender::QRenderCapture());
+        QPointer<Qt3DRender::QRenderCaptureReply> renderCaptureReply(renderCapture->requestCapture());
+
+        // THEN
+        QVERIFY(renderCaptureReply);
+
+        // WHEN
+        renderCapture.reset();
+
+        // THEN (Should not crash and delete reply)
+        QVERIFY(!renderCaptureReply);
+    }
+
 };
 
 QTEST_MAIN(tst_QRenderCapture)
diff --git a/tests/auto/render/renderer/tst_renderer.cpp b/tests/auto/render/renderer/tst_renderer.cpp
index bd1f7185e..c89805464 100644
--- a/tests/auto/render/renderer/tst_renderer.cpp
+++ b/tests/auto/render/renderer/tst_renderer.cpp
@@ -235,6 +235,8 @@ private Q_SLOTS:
                  1 + // cleanupJob
                  1 + // VAOGatherer
                  1 + // updateSkinningPaletteJob
+                 1 + // CalculateBoundingVolumeJob
+                 1 + // UpdateMeshTriangleListJob
                  1); // BufferGathererJob
 
         renderer.clearDirtyBits(Qt3DRender::Render::AbstractRenderer::AllDirty);
diff --git a/tests/manual/picking-qml/main.qml b/tests/manual/picking-qml/main.qml
index c020d5817..5ca50be0b 100644
--- a/tests/manual/picking-qml/main.qml
+++ b/tests/manual/picking-qml/main.qml
@@ -79,7 +79,19 @@ Entity {
         id: camera2
         projectionType: CameraLens.PerspectiveProjection
         fieldOfView: 45
-        aspectRatio: _view.width * 0.5 / _view.height
+        aspectRatio: _view.width * 0.5 / (_view.height * 0.5)
+        nearPlane : 0.1
+        farPlane : 1000.0
+        position: Qt.vector3d( 40.0, 5.0, -20.0 )
+        upVector: Qt.vector3d( 0.0, 1.0, 0.0 )
+        viewCenter: Qt.vector3d( 0.0, 0.0, 0.0 )
+    }
+
+    Camera {
+        id: camera3
+        projectionType: CameraLens.PerspectiveProjection
+        fieldOfView: 45
+        aspectRatio: _view.width * 0.5 / (_view.height * 0.5)
         nearPlane : 0.1
         farPlane : 1000.0
         position: Qt.vector3d( 40.0, 5.0, -20.0 )
@@ -113,7 +125,7 @@ Entity {
                     }
 
                     Viewport {
-                        normalizedRect: Qt.rect(0.5, 0.0, 0.5, 1.0)
+                        normalizedRect: Qt.rect(0.5, 0.0, 0.5, 0.5)
                         CameraSelector {
                             camera: camera2
                             LayerFilter {
@@ -122,6 +134,16 @@ Entity {
                             }
                         }
                     }
+                    Viewport {
+                        normalizedRect: Qt.rect(0.5, 0.5, 0.5, 0.5)
+                        CameraSelector {
+                            camera: camera3
+                            LayerFilter {
+                                // To show Debug volumes
+                                layers: [sceneRoot.contentLayer, sceneRoot.debugLayer]
+                            }
+                        }
+                    }
                 }
             }
         },