From 5124893ce5352ebdb917be2ef251d34efa4ae273 Mon Sep 17 00:00:00 2001
From: Mika Salmela <mika.salmela@qt.io>
Date: Thu, 26 May 2016 14:06:48 +0300
Subject: Updates to make it work again
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added import Qt3D.Extras and few filterKeys. Also AndroidManifest adjusted.

Change-Id: Id87c95319436e1da38e3ad5e2d73a20f42725fd1
Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
---
 android/AndroidManifest.xml            | 2 +-
 cinematic3d.pro                        | 2 ++
 qml/BackgroundCubeMap.qml              | 5 +++++
 qml/Cinematic3DScene.qml               | 1 +
 qml/Cover3D.qml                        | 5 +++++
 qml/EnvMappedBoxGLES2ShaderProgram.qml | 1 +
 qml/Sphere3D.qml                       | 1 +
 qml/TextureBox3D.qml                   | 5 +++++
 8 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 3b171c6..000c7fc 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -46,7 +46,7 @@
             <!-- Show translucent UI on top of Qt's surface when system theme mandates it -->
         </activity>
     </application>
-    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/>
+    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="16"/>
     <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
 
     <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
diff --git a/cinematic3d.pro b/cinematic3d.pro
index 3bb658b..f69fcfa 100644
--- a/cinematic3d.pro
+++ b/cinematic3d.pro
@@ -9,6 +9,8 @@ RESOURCES += \
     qml.qrc \
     images.qrc
 
+OTHER_FILES += qml/*.qml
+
 VIDEO_FILES.files = \
     # Note: Enable these if videos are bundled locally
     #videos/Build_Your_World_With_Qt.mp4 \
diff --git a/qml/BackgroundCubeMap.qml b/qml/BackgroundCubeMap.qml
index 1c9aa8c..36cb3a8 100644
--- a/qml/BackgroundCubeMap.qml
+++ b/qml/BackgroundCubeMap.qml
@@ -40,6 +40,7 @@
 
 import Qt3D.Core 2.0
 import Qt3D.Render 2.0
+import Qt3D.Extras 2.0
 
 Entity {
     property alias cameraPosition: transform.translation
@@ -116,6 +117,8 @@ Entity {
         effect: Effect {
             techniques: [
                 Technique {
+                    filterKeys: FilterKey { name: "renderingStyle"; value: "forward" }
+
                     graphicsApiFilter {
                         api: GraphicsApiFilter.OpenGLES
                         profile: GraphicsApiFilter.NoProfile
@@ -131,6 +134,8 @@ Entity {
                     }
                 },
                 Technique {
+                    filterKeys: FilterKey { name: "renderingStyle"; value: "forward" }
+
                     graphicsApiFilter {
                         api: GraphicsApiFilter.OpenGL
                         profile: GraphicsApiFilter.NoProfile
diff --git a/qml/Cinematic3DScene.qml b/qml/Cinematic3DScene.qml
index d4dfa38..b8af5aa 100644
--- a/qml/Cinematic3DScene.qml
+++ b/qml/Cinematic3DScene.qml
@@ -41,6 +41,7 @@
 import Qt3D.Core 2.0
 import Qt3D.Render 2.0
 import QtQuick 2.4 as QQ2
+import Qt3D.Extras 2.0
 
 Entity {
     id: root
diff --git a/qml/Cover3D.qml b/qml/Cover3D.qml
index f9d5057..c449f8a 100644
--- a/qml/Cover3D.qml
+++ b/qml/Cover3D.qml
@@ -41,6 +41,7 @@
 import Qt3D.Core 2.0
 import Qt3D.Render 2.0
 import QtQuick 2.4 as QQ2
+import Qt3D.Extras 2.0
 
 Entity {
     id: entity
@@ -86,6 +87,8 @@ Entity {
 
             techniques: [
                 Technique {
+                    filterKeys: FilterKey { name: "renderingStyle"; value: "forward" }
+
                     graphicsApiFilter {
                         api: GraphicsApiFilter.OpenGL
                         profile: GraphicsApiFilter.NoProfile
@@ -103,6 +106,8 @@ Entity {
                     }
                 },
                 Technique {
+                    filterKeys: FilterKey { name: "renderingStyle"; value: "forward" }
+
                     graphicsApiFilter {
                         api: GraphicsApiFilter.OpenGLES
                         profile: GraphicsApiFilter.NoProfile
diff --git a/qml/EnvMappedBoxGLES2ShaderProgram.qml b/qml/EnvMappedBoxGLES2ShaderProgram.qml
index e4183d8..a610580 100644
--- a/qml/EnvMappedBoxGLES2ShaderProgram.qml
+++ b/qml/EnvMappedBoxGLES2ShaderProgram.qml
@@ -39,6 +39,7 @@
 ****************************************************************************/
 
 import Qt3D.Render 2.0
+import Qt3D.Extras 2.0
 
 ShaderProgram {
     vertexShaderCode: "
diff --git a/qml/Sphere3D.qml b/qml/Sphere3D.qml
index f5a89a3..581dcda 100644
--- a/qml/Sphere3D.qml
+++ b/qml/Sphere3D.qml
@@ -40,6 +40,7 @@
 
 import Qt3D.Core 2.0
 import Qt3D.Render 2.0
+import Qt3D.Extras 2.0
 
 Entity {
     id: entity
diff --git a/qml/TextureBox3D.qml b/qml/TextureBox3D.qml
index 9440813..aafb7c4 100644
--- a/qml/TextureBox3D.qml
+++ b/qml/TextureBox3D.qml
@@ -41,6 +41,7 @@
 import Qt3D.Core 2.0
 import Qt3D.Render 2.0
 import QtQuick 2.4 as QQ2
+import Qt3D.Extras 2.0
 
 Entity {
     id: entity
@@ -82,6 +83,8 @@ Entity {
 
             techniques: [
                 Technique {
+                    filterKeys: FilterKey { name: "renderingStyle"; value: "forward" }
+
                     graphicsApiFilter {
                         api: GraphicsApiFilter.OpenGL
                         profile: GraphicsApiFilter.NoProfile
@@ -99,6 +102,8 @@ Entity {
                     }
                 },
                 Technique {
+                    filterKeys: FilterKey { name: "renderingStyle"; value: "forward" }
+
                     graphicsApiFilter {
                         api: GraphicsApiFilter.OpenGLES
                         profile: GraphicsApiFilter.NoProfile
-- 
cgit v1.2.3