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

11 files changed, 16 insertions, 16 deletions

diff --git a/src/render/geometry/qbuffer.h b/src/render/geometry/qbuffer.h
index be1b188d0..ebb2d9a55 100644
--- a/src/render/geometry/qbuffer.h
+++ b/src/render/geometry/qbuffer.h
@@ -85,7 +85,7 @@ public:
     };
     Q_ENUM(UsageType)
 
-    explicit QBuffer(BufferType ty = QBuffer::VertexBuffer, Qt3DCore::QNode *parent = 0);
+    explicit QBuffer(BufferType ty = QBuffer::VertexBuffer, Qt3DCore::QNode *parent = Q_NULLPTR);
     ~QBuffer();
 
     UsageType usage() const;
diff --git a/src/render/geometry/qcuboidmesh.h b/src/render/geometry/qcuboidmesh.h
index 920c6aed2..5db062cbd 100644
--- a/src/render/geometry/qcuboidmesh.h
+++ b/src/render/geometry/qcuboidmesh.h
@@ -60,7 +60,7 @@ class QT3DRENDERSHARED_EXPORT QCuboidMesh : public QGeometryRenderer
     Q_PROPERTY(QSize xyMeshResolution READ xyMeshResolution WRITE setXYMeshResolution NOTIFY xyMeshResolutionChanged)
 
 public:
-    explicit QCuboidMesh(Qt3DCore::QNode *parent = 0);
+    explicit QCuboidMesh(Qt3DCore::QNode *parent = Q_NULLPTR);
     ~QCuboidMesh();
 
     float xExtent() const;
diff --git a/src/render/geometry/qcylindergeometry.h b/src/render/geometry/qcylindergeometry.h
index 7903e8767..37f46b76b 100644
--- a/src/render/geometry/qcylindergeometry.h
+++ b/src/render/geometry/qcylindergeometry.h
@@ -63,7 +63,7 @@ class QT3DRENDERSHARED_EXPORT QCylinderGeometry : public QGeometry
     Q_PROPERTY(Qt3DRender::QAttribute *indexAttribute READ indexAttribute CONSTANT)
 
 public:
-    explicit QCylinderGeometry(QNode *parent = 0);
+    explicit QCylinderGeometry(QNode *parent = Q_NULLPTR);
     ~QCylinderGeometry();
 
     void updateVertices();
@@ -92,7 +92,7 @@ Q_SIGNALS:
     void lengthChanged(float length);
 
 protected:
-    QCylinderGeometry(QCylinderGeometryPrivate &dd, QNode *parent = 0);
+    QCylinderGeometry(QCylinderGeometryPrivate &dd, QNode *parent = Q_NULLPTR);
 
 private:
     Q_DECLARE_PRIVATE(QCylinderGeometry)
diff --git a/src/render/geometry/qcylindermesh.h b/src/render/geometry/qcylindermesh.h
index c26fa9ddd..6af1a62b1 100644
--- a/src/render/geometry/qcylindermesh.h
+++ b/src/render/geometry/qcylindermesh.h
@@ -56,7 +56,7 @@ class QT3DRENDERSHARED_EXPORT QCylinderMesh : public QGeometryRenderer
     Q_PROPERTY(float radius READ radius WRITE setRadius NOTIFY radiusChanged)
     Q_PROPERTY(float length READ length WRITE setLength NOTIFY lengthChanged)
 public:
-    explicit QCylinderMesh(Qt3DCore::QNode *parent = 0);
+    explicit QCylinderMesh(Qt3DCore::QNode *parent = Q_NULLPTR);
     ~QCylinderMesh();
 
     int rings() const;
diff --git a/src/render/geometry/qgeometry.h b/src/render/geometry/qgeometry.h
index 58f7f50ac..b392d7866 100644
--- a/src/render/geometry/qgeometry.h
+++ b/src/render/geometry/qgeometry.h
@@ -55,7 +55,7 @@ class QT3DRENDERSHARED_EXPORT QGeometry : public Qt3DCore::QNode
     Q_OBJECT
     Q_PROPERTY(Qt3DRender::QAttribute *boundingVolumePositionAttribute READ boundingVolumePositionAttribute WRITE setBoundingVolumePositionAttribute NOTIFY boundingVolumePositionAttributeChanged)
 public:
-    explicit QGeometry(Qt3DCore::QNode *parent = 0);
+    explicit QGeometry(Qt3DCore::QNode *parent = Q_NULLPTR);
     ~QGeometry();
 
     QVector<QAttribute *> attributes() const;
@@ -71,7 +71,7 @@ Q_SIGNALS:
     void boundingVolumePositionAttributeChanged(QAttribute *boundingVolumePositionAttribute);
 
 protected:
-    QGeometry(QGeometryPrivate &dd, Qt3DCore::QNode *parent = 0);
+    QGeometry(QGeometryPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR);
     void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
diff --git a/src/render/geometry/qgeometryrenderer.h b/src/render/geometry/qgeometryrenderer.h
index 2b348b952..8a2e85459 100644
--- a/src/render/geometry/qgeometryrenderer.h
+++ b/src/render/geometry/qgeometryrenderer.h
@@ -67,7 +67,7 @@ class QT3DRENDERSHARED_EXPORT QGeometryRenderer : public Qt3DCore::QComponent
     Q_PROPERTY(PrimitiveType primitiveType READ primitiveType WRITE setPrimitiveType NOTIFY primitiveTypeChanged)
 
 public:
-    explicit QGeometryRenderer(Qt3DCore::QNode *parent = 0);
+    explicit QGeometryRenderer(Qt3DCore::QNode *parent = Q_NULLPTR);
     ~QGeometryRenderer();
 
     enum PrimitiveType {
@@ -125,7 +125,7 @@ Q_SIGNALS:
     void primitiveTypeChanged(PrimitiveType primitiveType);
 
 protected:
-    QGeometryRenderer(QGeometryRendererPrivate &dd, Qt3DCore::QNode *parent = 0);
+    QGeometryRenderer(QGeometryRendererPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR);
     void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
 
diff --git a/src/render/geometry/qmesh.h b/src/render/geometry/qmesh.h
index 1b1db98ca..36778f6ad 100644
--- a/src/render/geometry/qmesh.h
+++ b/src/render/geometry/qmesh.h
@@ -61,7 +61,7 @@ class QT3DRENDERSHARED_EXPORT QMesh : public QGeometryRenderer
     Q_PROPERTY(QString meshName READ meshName WRITE setMeshName NOTIFY meshNameChanged)
 
 public:
-    explicit QMesh(Qt3DCore::QNode *parent = 0);
+    explicit QMesh(Qt3DCore::QNode *parent = Q_NULLPTR);
     ~QMesh();
 
     QUrl source() const;
@@ -76,7 +76,7 @@ Q_SIGNALS:
     void meshNameChanged(const QString &meshName);
 
 protected:
-    QMesh(QMeshPrivate &dd, Qt3DCore::QNode *parent = 0);
+    QMesh(QMeshPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR);
 
 private:
     Q_DECLARE_PRIVATE(QMesh)
diff --git a/src/render/geometry/qplanemesh.h b/src/render/geometry/qplanemesh.h
index 5cb4686ca..db0f43109 100644
--- a/src/render/geometry/qplanemesh.h
+++ b/src/render/geometry/qplanemesh.h
@@ -56,7 +56,7 @@ class QT3DRENDERSHARED_EXPORT QPlaneMesh : public QGeometryRenderer
     Q_PROPERTY(QSize meshResolution READ meshResolution WRITE setMeshResolution NOTIFY meshResolutionChanged)
 
 public:
-    explicit QPlaneMesh(Qt3DCore::QNode *parent = 0);
+    explicit QPlaneMesh(Qt3DCore::QNode *parent = Q_NULLPTR);
     ~QPlaneMesh();
 
     float width() const;
diff --git a/src/render/geometry/qspheremesh.h b/src/render/geometry/qspheremesh.h
index a3218bc1d..ee76ae110 100644
--- a/src/render/geometry/qspheremesh.h
+++ b/src/render/geometry/qspheremesh.h
@@ -58,7 +58,7 @@ class QT3DRENDERSHARED_EXPORT QSphereMesh : public QGeometryRenderer
     Q_PROPERTY(bool generateTangents READ generateTangents WRITE setGenerateTangents NOTIFY generateTangentsChanged)
 
 public:
-    explicit QSphereMesh(Qt3DCore::QNode *parent = 0);
+    explicit QSphereMesh(Qt3DCore::QNode *parent = Q_NULLPTR);
     ~QSphereMesh();
 
     int rings() const;
diff --git a/src/render/geometry/qtorusgeometry.h b/src/render/geometry/qtorusgeometry.h
index 220bb257e..64c5f885d 100644
--- a/src/render/geometry/qtorusgeometry.h
+++ b/src/render/geometry/qtorusgeometry.h
@@ -63,7 +63,7 @@ class QT3DRENDERSHARED_EXPORT QTorusGeometry : public QGeometry
     Q_PROPERTY(Qt3DRender::QAttribute *indexAttribute READ indexAttribute CONSTANT)
 
 public:
-    explicit QTorusGeometry(QNode *parent = 0);
+    explicit QTorusGeometry(QNode *parent = Q_NULLPTR);
     ~QTorusGeometry();
 
     void updateVertices();
@@ -93,7 +93,7 @@ Q_SIGNALS:
 
 
 protected:
-    QTorusGeometry(QTorusGeometryPrivate &dd, QNode *parent = 0);
+    QTorusGeometry(QTorusGeometryPrivate &dd, QNode *parent = Q_NULLPTR);
 
 private:
     Q_DECLARE_PRIVATE(QTorusGeometry)
diff --git a/src/render/geometry/qtorusmesh.h b/src/render/geometry/qtorusmesh.h
index b41f6449c..6783c6833 100644
--- a/src/render/geometry/qtorusmesh.h
+++ b/src/render/geometry/qtorusmesh.h
@@ -55,7 +55,7 @@ class QT3DRENDERSHARED_EXPORT QTorusMesh : public QGeometryRenderer
     Q_PROPERTY(float radius READ radius WRITE setRadius NOTIFY radiusChanged)
     Q_PROPERTY(float minorRadius READ minorRadius WRITE setMinorRadius NOTIFY minorRadiusChanged)
 public:
-    explicit QTorusMesh(Qt3DCore::QNode *parent = 0);
+    explicit QTorusMesh(Qt3DCore::QNode *parent = Q_NULLPTR);
     ~QTorusMesh();
 
     int rings() const;