diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2019-06-03 12:29:29 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-06-03 12:29:52 +0200 |
| commit | 0d740567cac4b3be17f1f3facaddc2974dfba3e7 (patch) | |
| tree | 17e96e837054cc8aede398a986a8ad3d4a9e781a /src/render/texture | |
| parent | 4b19879345119e7e96a3e623c212c6436af82e0c (diff) | |
| parent | 4eee1ab5a51ac482e2252e2e85c0fe624d5d4bad (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
Diffstat (limited to 'src/render/texture')
| -rw-r--r-- | src/render/texture/qtexture.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/render/texture/qtexture.cpp b/src/render/texture/qtexture.cpp index fc62b76ff..5fd2f4169 100644 --- a/src/render/texture/qtexture.cpp +++ b/src/render/texture/qtexture.cpp @@ -1258,6 +1258,13 @@ void QTextureLoaderPrivate::updateGenerator() \brief Handles the texture loading and setting the texture's properties. */ /*! + \qmltype TextureLoader + \instantiates Qt3DRender::QTextureLoader + \inqmlmodule Qt3D.Render + + \brief Handles the texture loading and setting the texture's properties. +*/ +/*! * Constructs a new Qt3DRender::QTextureLoader instance with \a parent as parent. * * Note that by default, if not contradicted by the file metadata, the loaded texture @@ -1295,7 +1302,12 @@ QTextureLoader::~QTextureLoader() /*! \property QTextureLoader::source - Returns the current texture source. + \brief The current texture source. +*/ +/*! + \qmlproperty url Qt3D.Render::TextureLoader::source + + This property holds the current texture source. */ QUrl QTextureLoader::source() const { @@ -1347,7 +1359,7 @@ void QTextureLoader::setSource(const QUrl& source) */ /*! - \qmlproperty bool Qt3DRender::QTextureLoader::mirrored + \qmlproperty bool Qt3D.Render::TextureLoader::mirrored This property specifies whether the texture should be mirrored when loaded. This is a convenience to avoid having to manipulate images to match the origin of |