diff options
author | Nico Vertriest <nico.vertriest@qt.io> | 2016-12-02 14:57:10 +0100 |
---|---|---|
committer | Nico Vertriest <nico.vertriest@theqtcompany.com> | 2016-12-07 15:08:03 +0000 |
commit | 62409fbafc0cf5b11d2a3c646f97f527668b9ae1 (patch) | |
tree | 582c0336beccd80e8789b7c276e0ec213282ef30 | |
parent | f8ba0ee64abe614780324711c8b0b7274d38eb0a (diff) |
Doc: removed superfluous (double) documentation + link error
- removed link to Tessellation Modes QML Example
- QMouseDevice::sensitivity documented twice
- QTextureImage::source documented twice
Change-Id: I7d1a37a158bf2861103b20a5d387a005e7c759c6
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
-rw-r--r-- | src/doc/src/qt3d-overview.qdoc | 1 | ||||
-rw-r--r-- | src/input/frontend/qmousedevice.cpp | 11 | ||||
-rw-r--r-- | src/render/texture/qtextureimage.cpp | 16 |
3 files changed, 4 insertions, 24 deletions
diff --git a/src/doc/src/qt3d-overview.qdoc b/src/doc/src/qt3d-overview.qdoc index e22e2ba4e..e1f3d8629 100644 --- a/src/doc/src/qt3d-overview.qdoc +++ b/src/doc/src/qt3d-overview.qdoc @@ -98,7 +98,6 @@ fragment shaders. Compute shaders are planned for a future release. For examples of using shaders, see the Simple Shaders QML Example, - \l {Qt 3D: Tessellation Modes QML Example}, \l {Qt 3D: Shadow Map QML Example}, \l{Qt 3D: Wireframe QML Example}, and \l {Qt 3D: Wave QML Example}. diff --git a/src/input/frontend/qmousedevice.cpp b/src/input/frontend/qmousedevice.cpp index e7d68b2bc..744d289f3 100644 --- a/src/input/frontend/qmousedevice.cpp +++ b/src/input/frontend/qmousedevice.cpp @@ -105,12 +105,6 @@ QMouseDevicePrivate::QMouseDevicePrivate() Default is 0.1. */ -/*! - \property Qt3DInput::QMouseDevice::sensitivity - - Holds the sensitivity of the mouse device. - Default is 0.1. - */ /*! Constructs a new QMouseDevice instance with parent \a parent. @@ -202,8 +196,9 @@ int QMouseDevice::buttonIdentifier(const QString &name) const /*! \property Qt3DInput::QMouseDevice::sensitivity - The sensitivity of the device. - */ + Holds the sensitivity of the mouse device. + The default is 0.1. +*/ float QMouseDevice::sensitivity() const { Q_D(const QMouseDevice); diff --git a/src/render/texture/qtextureimage.cpp b/src/render/texture/qtextureimage.cpp index 20e448c09..9834a4e0a 100644 --- a/src/render/texture/qtextureimage.cpp +++ b/src/render/texture/qtextureimage.cpp @@ -82,13 +82,6 @@ namespace Qt3DRender { */ /*! - \qmlproperty url TextureImage::source - - This property holds the source url from which data for the texture - image will be loaded. -*/ - -/*! \qmlproperty enumeration TextureImage::status This property holds the status of the texture image loading. @@ -103,7 +96,7 @@ namespace Qt3DRender { */ /*! - \property QTextureImage::source + \property Qt3DRender::QTextureImage::source This property holds the source url from which data for the texture image will be loaded. @@ -164,13 +157,6 @@ bool QTextureImage::isMirrored() const } /*! - \property Qt3DRender::QTextureImage::source - - This property holds the source url from which data for the texture - image will be loaded. -*/ - -/*! \qmlproperty url Qt3D.Render::TextureImage::source This property holds the source url from which data for the texture |