From fb9e66188e0582a6b80ad3b8b3ac80024180a9df Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Thu, 16 Mar 2017 12:39:03 +0100 Subject: Doc: Fix QDoc error by using #ifndef Q_QDOC to omit unused function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also fix the function signature in the qdoc file. Change-Id: If8a7cb83f94efb9a5a999c99fce722e4ffb96312 Reviewed-by: Topi Reiniö Reviewed-by: Tomi Korpipää --- src/datavisualization/doc/src/qtdatavisualization.qdoc | 4 ++-- src/datavisualization/utils/qutils.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/datavisualization') diff --git a/src/datavisualization/doc/src/qtdatavisualization.qdoc b/src/datavisualization/doc/src/qtdatavisualization.qdoc index 3b670e51..551281d8 100644 --- a/src/datavisualization/doc/src/qtdatavisualization.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization.qdoc @@ -230,7 +230,7 @@ */ /*! - * \fn QSurfaceFormat QtDataVisualization::qDefaultSurfaceFormat(bool antialias = true) + * \fn QSurfaceFormat QtDataVisualization::qDefaultSurfaceFormat(bool antialias) * \relates QAbstract3DGraph * * This convenience function can be used to create a custom surface format suitable for use by @@ -239,7 +239,7 @@ * The \a antialias parameter specifies whether or not antialiasing is activated. * * Give the surface format returned by this function to the graph constructor (C++) or set - * it as the window format for QQuickView (QML) before calling show on it. + * it as the window format for QQuickView (QML) before calling \c show() on it. * * For example, disable antialiasing on C++ application: * diff --git a/src/datavisualization/utils/qutils.h b/src/datavisualization/utils/qutils.h index e80e9170..4e3f3d0e 100644 --- a/src/datavisualization/utils/qutils.h +++ b/src/datavisualization/utils/qutils.h @@ -38,7 +38,9 @@ namespace QtDataVisualization { +#ifndef Q_QDOC static inline QSurfaceFormat qDefaultSurfaceFormat(bool antialias = true) Q_DECL_UNUSED; +#endif static inline QSurfaceFormat qDefaultSurfaceFormat(bool antialias) { bool isES = false; -- cgit v1.2.3