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

* origin/5.11:

  aa8e21c Add new Qt3D demo
  ca03367 Exclude demos from colibri imx6ull
  a5345fd qtwebbrowser: merge changes from qtwebbrowser git repo
  d7e9731 do not enable highdpiscaling on emulator
  f730907 Fix mediaplayer default video path
  09aa32d Fix some major scaling & font issues on ebike-demo

Change-Id: I044c29ea2908a6254f32b0623037ea63f23d25cb

1 files changed, 114 insertions, 0 deletions

diff --git a/basicsuite/advancedcustommaterial/SceneRoot.qml b/basicsuite/advancedcustommaterial/SceneRoot.qml
new file mode 100644
index 0000000..a15fb02
--- /dev/null
+++ b/basicsuite/advancedcustommaterial/SceneRoot.qml
@@ -0,0 +1,114 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import Qt3D.Core 2.0
+import Qt3D.Render 2.0
+import Qt3D.Extras 2.0
+import Qt3D.Input 2.0
+import QtQuick 2.0 as QQ2
+
+
+Entity {
+    id: sceneRoot
+
+    Camera {
+        id: camera
+        projectionType: CameraLens.PerspectiveProjection
+        fieldOfView: 45
+        nearPlane: 0.1
+        farPlane: 1000.0
+        position: Qt.vector3d(0.0, 4.0, 15.0)
+        upVector: Qt.vector3d(0.0, 1.0, 0.0)
+        viewCenter: Qt.vector3d(0.0, -2.0, 0.0)
+    }
+
+    FirstPersonCameraController {
+        camera: camera
+    }
+
+    Entity {
+        DirectionalLight {
+            id: directional
+            worldDirection: Qt.vector3d(0.3, -1.0, 5.0).normalized();
+            color: "#fff2a3"
+            intensity: 0.01
+        }
+        Transform {
+            id: lightpostransform
+            translation: Qt.vector3d(0.0, 50.0, 60.0)
+        }
+        components: [lightpostransform, directional]
+    }
+
+    Entity {
+        PointLight {
+            id: pointL
+            color: "#fff2a3"
+        }
+        Transform{
+            id: plightpostransform
+            translation: Qt.vector3d(0.0, 4.0, 15.0)
+        }
+        components: [plightpostransform, pointL]
+    }
+
+    components: [
+        RenderSettings {
+            activeFrameGraph: ForwardRenderer {
+                id: renderer
+                clearColor: "black"
+                camera: camera
+            }
+        },
+        InputSettings { }
+    ]
+
+    Water { }
+}