From 3b4a0ba314706a59c34e21eb4085e3b5a1ee6a8d Mon Sep 17 00:00:00 2001 From: Paul Lemire Date: Thu, 17 Mar 2016 12:20:22 +0100 Subject: QRenderSurfaceSelector cleanup Change-Id: Ic38c88d5e940f04667278015dc4f6c45f162e936 Task-number: QTBUG-51508 Reviewed-by: Sean Harmer --- examples/qt3d/anaglyph-rendering/StereoFrameGraph.qml | 2 +- examples/qt3d/examples-common/qt3dquickwindow.cpp | 2 +- examples/qt3d/materials/SortedForwardRenderer.qml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'examples/qt3d') diff --git a/examples/qt3d/anaglyph-rendering/StereoFrameGraph.qml b/examples/qt3d/anaglyph-rendering/StereoFrameGraph.qml index c39afc9d6..f48a066b9 100644 --- a/examples/qt3d/anaglyph-rendering/StereoFrameGraph.qml +++ b/examples/qt3d/anaglyph-rendering/StereoFrameGraph.qml @@ -55,7 +55,7 @@ Viewport { property alias leftCamera: leftCameraSelector.camera property alias rightCamera: rightCameraSelector.camera - property alias window: surfaceSelector.window + property alias window: surfaceSelector.surface RenderSurfaceSelector { id: surfaceSelector diff --git a/examples/qt3d/examples-common/qt3dquickwindow.cpp b/examples/qt3d/examples-common/qt3dquickwindow.cpp index 72e10c34e..e3e40912b 100644 --- a/examples/qt3d/examples-common/qt3dquickwindow.cpp +++ b/examples/qt3d/examples-common/qt3dquickwindow.cpp @@ -213,7 +213,7 @@ void Qt3DQuickWindow::setWindowSurface(QObject *rootObject) return; } - surfaceSelector->setWindow(this); + surfaceSelector->setSurface(this); } void Qt3DQuickWindow::setCameraAspectModeHelper() diff --git a/examples/qt3d/materials/SortedForwardRenderer.qml b/examples/qt3d/materials/SortedForwardRenderer.qml index 0c477d2fa..ba2922e90 100644 --- a/examples/qt3d/materials/SortedForwardRenderer.qml +++ b/examples/qt3d/materials/SortedForwardRenderer.qml @@ -57,7 +57,7 @@ TechniqueFilter { // Expose camera to allow user to choose which camera to use for rendering property alias camera: cameraSelector.camera - property alias window: surfaceSelector.window + property alias window: surfaceSelector.surface // Select the forward rendering Technique of any used Effect matchAll: [ FilterKey { name: "renderingStyle"; value: "forward" } ] -- cgit v1.2.3