Merge branch '5.6' into 5.7

Conflicts:
	examples/qt3d/examples-common/qorbitcontrol.h
	src/core/qnodecreatedchange.cpp
	src/core/qnodecreatedchange.h
	src/input/frontend/qaxisactionhandler.h
	src/input/frontend/qinputaspect.h
	src/input/frontend/qkeyboardhandler.h
	src/input/frontend/qmousedevice.h
	src/input/frontend/qmousehandler.h
	src/input/frontend/qphysicaldevicecreatedchange.h
	src/input/input.pro
	src/logic/qframeaction.h
	src/plugins/sceneparsers/assimp/assimp.pro
	src/quick3d/imports/input/importsinput.pro
	src/quick3d/imports/render/importsrender.pro
	src/render/backend/trianglesextractor.cpp
	src/render/framegraph/qclearbuffer.h
	src/render/framegraph/qlighting.h
	src/render/framegraph/qstateset.h
	src/render/frontend/qrenderattachment.h
	src/render/geometry/qabstractattribute.h
	src/render/geometry/qabstractbuffer.h
	src/render/geometry/qattribute.h
	src/render/geometry/qboundingvolumespecifier.h
	src/render/geometry/qbuffer.h
	src/render/materialsystem/qfilterkey.h
	src/render/materialsystem/qparameter.h
	src/render/materialsystem/qparametermapping.h
	src/render/renderstates/qblendstate.h
	src/render/renderstates/qdepthmask.h
	src/render/renderstates/qpointsize.cpp
	src/render/renderstates/qrenderstatecreatedchange.cpp
	src/render/renderstates/qstencilop.h
	src/render/renderstates/qstencilopseparate.h
	src/render/renderstates/qstenciltestseparate.h
	src/render/texture/qabstracttexture.h
	src/render/texture/qabstracttextureimage.h
	src/render/texture/qtextureproviders.h

Change-Id: I894d7781042cabdaa0cac690c198b57a41127bd4

10 files changed, 2 insertions, 3 deletions

diff --git a/examples/qt3d/audio-visualizer-qml/images/normalmap.png b/examples/qt3d/audio-visualizer-qml/images/normalmap.png
index be522bbf9..0c3941c4e 100644
--- a/examples/qt3d/audio-visualizer-qml/images/normalmap.png
+++ b/examples/qt3d/audio-visualizer-qml/images/normalmap.png
diff --git a/examples/qt3d/audio-visualizer-qml/images/songtitle.png b/examples/qt3d/audio-visualizer-qml/images/songtitle.png
index 1f47b971f..2a9961093 100644
--- a/examples/qt3d/audio-visualizer-qml/images/songtitle.png
+++ b/examples/qt3d/audio-visualizer-qml/images/songtitle.png
diff --git a/examples/qt3d/audio-visualizer-qml/touchsettings.cpp b/examples/qt3d/audio-visualizer-qml/touchsettings.cpp
index f55705395..0dd6d36d9 100644
--- a/examples/qt3d/audio-visualizer-qml/touchsettings.cpp
+++ b/examples/qt3d/audio-visualizer-qml/touchsettings.cpp
@@ -45,8 +45,7 @@ TouchSettings::TouchSettings(QObject *parent)
 
 bool TouchSettings::isHoverEnabled() const
 {
-#if defined(Q_OS_IOS) || defined(Q_OS_ANDROID) || defined(Q_OS_BLACKBERRY) || defined(Q_OS_QNX)
-    || defined(Q_OS_WINRT)
+#if defined(Q_OS_IOS) || defined(Q_OS_ANDROID) || defined(Q_OS_QNX) || defined(Q_OS_WINRT)
     return false;
 #else
     bool isTouch = false;
diff --git a/examples/qt3d/examples-common/qorbitcontrol.h b/examples/qt3d/examples-common/qorbitcontrol.h
index a99e38b66..dbfc6e08d 100644
--- a/examples/qt3d/examples-common/qorbitcontrol.h
+++ b/examples/qt3d/examples-common/qorbitcontrol.h
@@ -58,7 +58,7 @@ class QOrbitControl : public Qt3DCore::QEntity
     Q_PROPERTY(float zoomInLimit READ zoomInLimit WRITE setZoomInLimit NOTIFY zoomInLimitChanged)
 
 public:
-    explicit QOrbitControl(Qt3DCore::QNode *parent = Q_NULLPTR);
+    explicit QOrbitControl(Qt3DCore::QNode *parent = nullptr);
     ~QOrbitControl();
 
     float clampInputs(float input1, float input2);
diff --git a/examples/qt3d/planets-qml/android/res/drawable-hdpi/icon.png b/examples/qt3d/planets-qml/android/res/drawable-hdpi/icon.png
index c62530326..bd5939f42 100644
--- a/examples/qt3d/planets-qml/android/res/drawable-hdpi/icon.png
+++ b/examples/qt3d/planets-qml/android/res/drawable-hdpi/icon.png
diff --git a/examples/qt3d/planets-qml/android/res/drawable-ldpi/icon.png b/examples/qt3d/planets-qml/android/res/drawable-ldpi/icon.png
index c62530326..bd5939f42 100644
--- a/examples/qt3d/planets-qml/android/res/drawable-ldpi/icon.png
+++ b/examples/qt3d/planets-qml/android/res/drawable-ldpi/icon.png
diff --git a/examples/qt3d/planets-qml/android/res/drawable-mdpi/icon.png b/examples/qt3d/planets-qml/android/res/drawable-mdpi/icon.png
index c62530326..bd5939f42 100644
--- a/examples/qt3d/planets-qml/android/res/drawable-mdpi/icon.png
+++ b/examples/qt3d/planets-qml/android/res/drawable-mdpi/icon.png
diff --git a/examples/qt3d/planets-qml/images/galaxy_starfield.png b/examples/qt3d/planets-qml/images/galaxy_starfield.png
index 67d808aa6..36a762e3c 100644
--- a/examples/qt3d/planets-qml/images/galaxy_starfield.png
+++ b/examples/qt3d/planets-qml/images/galaxy_starfield.png
diff --git a/examples/qt3d/planets-qml/images/saturnringcolortrans.png b/examples/qt3d/planets-qml/images/saturnringcolortrans.png
index ad0073382..48a9a5911 100644
--- a/examples/qt3d/planets-qml/images/saturnringcolortrans.png
+++ b/examples/qt3d/planets-qml/images/saturnringcolortrans.png
diff --git a/examples/qt3d/planets-qml/images/uranusringcolortrans.png b/examples/qt3d/planets-qml/images/uranusringcolortrans.png
index 5a7a4a3a6..13a5f1558 100644
--- a/examples/qt3d/planets-qml/images/uranusringcolortrans.png
+++ b/examples/qt3d/planets-qml/images/uranusringcolortrans.png