diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-02 03:04:17 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-02 03:04:17 +0100 |
| commit | bf40a6cbf6b0045c157431f2717697c37bd20697 (patch) | |
| tree | 1c0ec64c7e4833d5f70f4816a55913353ed31ec9 /src/render/materialsystem/qshaderdata.cpp | |
| parent | d51c6983baedc283020b39062714962b6b7d0c5e (diff) | |
| parent | f4ce60ca6b92c5cbfebf7ed5f8436e5d84bfeab4 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-alpha1
Change-Id: I9b3faae3e87e1c68ae34bac278f08087dc6ac1a9
Diffstat (limited to 'src/render/materialsystem/qshaderdata.cpp')
| -rw-r--r-- | src/render/materialsystem/qshaderdata.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/render/materialsystem/qshaderdata.cpp b/src/render/materialsystem/qshaderdata.cpp index a636bc1a8..b70b99846 100644 --- a/src/render/materialsystem/qshaderdata.cpp +++ b/src/render/materialsystem/qshaderdata.cpp @@ -78,7 +78,7 @@ QShaderDataPrivate::QShaderDataPrivate(PropertyReaderInterfacePtr reader) /*! \fn Qt3DRender::PropertyReaderInterface::readProperty(const QVariant &v) - \return the property identifies by \a v + \return the property identified by \a v. */ /*! @@ -95,7 +95,7 @@ QShaderData::~QShaderData() } /*! * \brief QShaderData::propertyReader - * \return PropertyReaderInterfacePtr for this shader data + * Returns the PropertyReaderInterfacePtr for this shader data */ PropertyReaderInterfacePtr QShaderData::propertyReader() const { |