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

Conflicts:
	src/doc/src/qt3dcollision-module.qdoc
	src/render/frontend/qcamera.cpp
	src/render/frontend/qcameralens.cpp

Change-Id: I8a0ae250a6b8e065a1ef3c817968ebb7ef23b20d

1 files changed, 5 insertions, 15 deletions

diff --git a/src/core/services/qsysteminformationservice.cpp b/src/core/services/qsysteminformationservice.cpp
index fdc8594c9..f11e0c3d1 100644
--- a/src/core/services/qsysteminformationservice.cpp
+++ b/src/core/services/qsysteminformationservice.cpp
@@ -44,17 +44,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
 
-/*!
-    \class Qt3DCore::QAbstractServiceProviderPrivate
-    \internal
-*/
-
-/*!
-    \class Qt3DCore::QSystemInformationServicePrivate
-    \internal
-*/
-
-/*!
+/* !\internal
     \class Qt3DCore::QSystemInformationService
     \inmodule Qt3DCore
     \brief Interface for a Qt3D system information service
@@ -63,7 +53,7 @@ namespace Qt3DCore {
     system information service.
 */
 
-/*!
+/*
     Creates an instance of QSystemInformationService, with a \a description for
     the new service. This constructor is protected so only subclasses can
     instantiate a QSystemInformationService object.
@@ -73,7 +63,7 @@ QSystemInformationService::QSystemInformationService(const QString &description)
 {
 }
 
-/*!
+/*
     \internal
 */
 QSystemInformationService::QSystemInformationService(QSystemInformationServicePrivate &dd)
@@ -81,14 +71,14 @@ QSystemInformationService::QSystemInformationService(QSystemInformationServicePr
 {
 }
 
-/*!
+/*
     \fn QStringList Qt3DCore::QSystemInformationService::aspectNames() const
 
     Subclasses should override this function and return a string list containing the
     names of all registered aspects.
 */
 
-/*!
+/*
     \fn int Qt3DCore::QSystemInformationService::threadPoolThreadCount() const
 
     Subclasses should override this function and return the number of threads in the