Merge remote-tracking branch 'origin/5.7' into 5.8

Conflicts:
	src/render/framegraph/qrendersurfaceselector.cpp
	src/render/frontend/qrendersettings.cpp
	src/render/jobs/renderviewjobutils_p.h
	tests/auto/render/render.pro

Change-Id: Ibe9eb962e3990e07f01a5608a2d60c79bc4c160f

1 files changed, 24 insertions, 14 deletions

diff --git a/src/render/framegraph/qcameraselector.cpp b/src/render/framegraph/qcameraselector.cpp
index a9188cd99..c7d299b9b 100644
--- a/src/render/framegraph/qcameraselector.cpp
+++ b/src/render/framegraph/qcameraselector.cpp
@@ -48,13 +48,15 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DRender {
 
 /*!
-  \class Qt3DRender::QCameraSelector
-  \inmodule Qt3DRender
-  \since 5.5
-  \ingroup framegraph
+    \class Qt3DRender::QCameraSelector
+    \inmodule Qt3DRender
+    \since 5.5
+    \ingroup framegraph
 
-  \brief Class to allow for selection of camera to be used
+    \brief Class to allow for selection of camera to be used
 
+    A Qt3DRender::QCameraSelector can be used to select the camera, which is used
+    by the FrameGraph when drawing the entities.
  */
 
 /*!
@@ -63,9 +65,25 @@ namespace Qt3DRender {
     \instantiates Qt3DRender::QCameraSelector
     \inherits FrameGraphNode
     \since 5.5
-    \qmlabstract
+    \brief Class to allow for selection of camera to be used
+
+    A CameraSelector can be used to select the camera, which is used
+    by the FrameGraph when drawing the entities.
+*/
+
+/*!
+    \qmlproperty Entity Qt3D.Render::CameraSelector::camera
+
+    Holds the currently selected camera.
 */
 
+/*!
+    \property Qt3DRender::QCameraSelector::camera
+
+    Holds the currently selected camera.
+*/
+
+
 /*! \internal */
 QCameraSelector::QCameraSelector(QCameraSelectorPrivate &dd, QNode *parent)
     : QFrameGraphNode(dd, parent)
@@ -91,14 +109,6 @@ QCameraSelector::~QCameraSelector()
 {
 }
 
-/*!
-    \property Qt3DRender::QCameraSelector::camera
-*/
-
-/*!
-  \qmlproperty Entity Qt3D.Render::CameraSelector::camera
-
-*/
 void QCameraSelector::setCamera(Qt3DCore::QEntity *camera)
 {
     Q_D(QCameraSelector);