diff options
| author | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2017-03-16 12:39:03 +0100 |
|---|---|---|
| committer | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2017-03-17 08:25:11 +0000 |
| commit | fb9e66188e0582a6b80ad3b8b3ac80024180a9df (patch) | |
| tree | 93c695a3a2887a34fabe5c2acbe1ff1596c4f6fa /src/datavisualization | |
| parent | a29f9af154aca4a88be3df46641762a289556693 (diff) | |
Doc: Fix QDoc error by using #ifndef Q_QDOC to omit unused function
Also fix the function signature in the qdoc file.
Change-Id: If8a7cb83f94efb9a5a999c99fce722e4ffb96312
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/datavisualization')
| -rw-r--r-- | src/datavisualization/doc/src/qtdatavisualization.qdoc | 4 | ||||
| -rw-r--r-- | src/datavisualization/utils/qutils.h | 2 |
2 files changed, 4 insertions, 2 deletions
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; |