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

Change-Id: Id669d5c1aab29965eac0dabd1cb497e908dac23e

3 files changed, 30 insertions, 28 deletions

diff --git a/examples/qt3d/basicshapes-cpp/main.cpp b/examples/qt3d/basicshapes-cpp/main.cpp
index fffb83a20..a347e9fb2 100644
--- a/examples/qt3d/basicshapes-cpp/main.cpp
+++ b/examples/qt3d/basicshapes-cpp/main.cpp
@@ -63,8 +63,6 @@
 #include <QtWidgets/QCommandLinkButton>
 #include <QtGui/QScreen>
 
-#include <Qt3DInput/QInputAspect>
-
 #include <Qt3DExtras/qtorusmesh.h>
 #include <Qt3DRender/qmesh.h>
 #include <Qt3DRender/qtechnique.h>
@@ -103,9 +101,6 @@ int main(int argc, char **argv)
 
     widget->setWindowTitle(QStringLiteral("Basic shapes"));
 
-    Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect;
-    view->registerAspect(input);
-
     // Root entity
     Qt3DCore::QEntity *rootEntity = new Qt3DCore::QEntity();
 
diff --git a/examples/qt3d/qt3d.pro b/examples/qt3d/qt3d.pro
index 91163a0d1..52ae5389c 100644
--- a/examples/qt3d/qt3d.pro
+++ b/examples/qt3d/qt3d.pro
@@ -1,30 +1,8 @@
 TEMPLATE = subdirs
 
 SUBDIRS += \
-    simple-qml \
     simple-cpp \
-    multiviewport \
-    wireframe \
-    shadow-map-qml \
-    wave \
-    scene3d \
-    controls \
-    anaglyph-rendering \
-    planets-qml \
-    instanced-arrays-qml \
-    lights \
-    compute-particles \
-    3d-text \
-    qardboard \
-    advancedcustommaterial \
-    simplecustommaterial \
-    scene2d \
-    phong-cubes \
-    pbr-materials \
-    controlsunderlay \
-    scene3dview
-
-qtHaveModule(multimedia): SUBDIRS += audio-visualizer-qml
+    3d-text
 
 # qmake seems to break in some CI configurations, disable this for now
 #SUBDIRS += qgltf
@@ -37,5 +15,33 @@ qtHaveModule(widgets) {
     qtHaveModule(quickwidgets): SUBDIRS += widgets-scene3d
 }
 
+qtHaveModule(quick) {
+    qtHaveModule(multimedia) {
+        SUBDIRS += audio-visualizer-qml
+    }
+
+    SUBDIRS += \
+        simple-qml \
+        shadow-map-qml \
+        instanced-arrays-qml \
+        planets-qml \
+        advancedcustommaterial \
+        anaglyph-rendering \
+        compute-particles \
+        phong-cubes \
+        lights \
+        scene3dview \
+        controlsunderlay \
+        simplecustommaterial \
+        qardboard \
+        pbr-materials \
+        scene2d \
+        multiviewport \
+        wireframe \
+        wave \
+        scene3d \
+        controls
+}
+
 EXAMPLE_FILES += \
     exampleresources
diff --git a/examples/qt3d/simple-cpp/main.cpp b/examples/qt3d/simple-cpp/main.cpp
index 6b45dd1d0..80da0552a 100644
--- a/examples/qt3d/simple-cpp/main.cpp
+++ b/examples/qt3d/simple-cpp/main.cpp
@@ -101,6 +101,7 @@ Qt3DCore::QEntity *createScene()
     Qt3DCore::QEntity *sphereEntity = new Qt3DCore::QEntity(rootEntity);
     Qt3DExtras::QSphereMesh *sphereMesh = new Qt3DExtras::QSphereMesh;
     sphereMesh->setRadius(3);
+    sphereMesh->setGenerateTangents(true);
 
     Qt3DCore::QTransform *sphereTransform = new Qt3DCore::QTransform;
     OrbitTransformController *controller = new OrbitTransformController(sphereTransform);