From 4b4a407512fdd4cc0a2f7caa463b7b03520b3f62 Mon Sep 17 00:00:00 2001
From: Sean Harmer <sean.harmer@kdab.com>
Date: Mon, 18 Jan 2016 10:08:41 +0000
Subject: Temporarily expose window to QML context

Allows to restore most of the QML examples using this approach until a
more permanent solution can be developed (I have an idea on how to do
this and will try it today).

Change-Id: I9b9bb86a5323140be3ed2456cdfa91b1f93187b1
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
---
 .../qt3d/multiviewport/QuadViewportFrameGraph.qml  | 55 ++++++++++++----------
 examples/qt3d/multiviewport/main.qml               |  1 +
 2 files changed, 31 insertions(+), 25 deletions(-)

(limited to 'examples/qt3d/multiviewport')

diff --git a/examples/qt3d/multiviewport/QuadViewportFrameGraph.qml b/examples/qt3d/multiviewport/QuadViewportFrameGraph.qml
index 2011aaf4d..1fd00740b 100644
--- a/examples/qt3d/multiviewport/QuadViewportFrameGraph.qml
+++ b/examples/qt3d/multiviewport/QuadViewportFrameGraph.qml
@@ -44,37 +44,42 @@ FrameGraph {
     property alias topRightCamera: cameraSelectorTopRightViewport.camera;
     property alias bottomLeftCamera: cameraSelectorBottomLeftViewport.camera;
     property alias bottomRightCamera: cameraSelectorBottomRightViewport.camera;
+    property alias window: surfaceSelector.window
 
-    Viewport {
-        id: mainViewport
-        rect: Qt.rect(0, 0, 1, 1)
-
-        ClearBuffer {
-            buffers: ClearBuffer.ColorDepthBuffer
-        }
+    RenderSurfaceSelector {
+        id: surfaceSelector
 
         Viewport {
-            id: topLeftViewport
-            rect: Qt.rect(0, 0, 0.5, 0.5)
-            CameraSelector { id: cameraSelectorTopLeftViewport }
-        }
+            id: mainViewport
+            rect: Qt.rect(0, 0, 1, 1)
 
-        Viewport {
-            id: topRightViewport
-            rect: Qt.rect(0.5, 0, 0.5, 0.5)
-            CameraSelector { id: cameraSelectorTopRightViewport }
-        }
+            ClearBuffer {
+                buffers: ClearBuffer.ColorDepthBuffer
+            }
 
-        Viewport {
-            id: bottomLeftViewport
-            rect: Qt.rect(0, 0.5, 0.5, 0.5)
-            CameraSelector { id: cameraSelectorBottomLeftViewport }
-        }
+            Viewport {
+                id: topLeftViewport
+                rect: Qt.rect(0, 0, 0.5, 0.5)
+                CameraSelector { id: cameraSelectorTopLeftViewport }
+            }
 
-        Viewport {
-            id: bottomRightViewport
-            rect: Qt.rect(0.5, 0.5, 0.5, 0.5)
-            CameraSelector { id: cameraSelectorBottomRightViewport }
+            Viewport {
+                id: topRightViewport
+                rect: Qt.rect(0.5, 0, 0.5, 0.5)
+                CameraSelector { id: cameraSelectorTopRightViewport }
+            }
+
+            Viewport {
+                id: bottomLeftViewport
+                rect: Qt.rect(0, 0.5, 0.5, 0.5)
+                CameraSelector { id: cameraSelectorBottomLeftViewport }
+            }
+
+            Viewport {
+                id: bottomRightViewport
+                rect: Qt.rect(0.5, 0.5, 0.5, 0.5)
+                CameraSelector { id: cameraSelectorBottomRightViewport }
+            }
         }
     }
 }
diff --git a/examples/qt3d/multiviewport/main.qml b/examples/qt3d/multiviewport/main.qml
index cfdd7a1a5..66ab274ab 100644
--- a/examples/qt3d/multiviewport/main.qml
+++ b/examples/qt3d/multiviewport/main.qml
@@ -48,6 +48,7 @@ Entity {
         topRightCamera: cameraSet.cameras[1]
         bottomLeftCamera: cameraSet.cameras[2]
         bottomRightCamera: cameraSet.cameras[3]
+        window: _q_window
     }
 
     Entity {
-- 
cgit v1.2.3