diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-26 22:21:21 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-26 22:21:22 +0200 |
| commit | fbe631c046a2246db46d0687d1c771d7d63a74e0 (patch) | |
| tree | 9c66a72ab438b8df4cd2edd73d1d2864b4c07bce /src/render/texture | |
| parent | 829675b65b8a9d661828b18bbd2703744d4c3db7 (diff) | |
| parent | 08b40b9be75242505a773dc5b2a96a5ef481d6e6 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I4a35126d98e04ed228e5b3a4ed9157995bef3a0a
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 cf93f872f..0e652c6ff 100644 --- a/src/render/texture/qtexture.cpp +++ b/src/render/texture/qtexture.cpp @@ -1279,6 +1279,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 @@ -1316,7 +1323,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 { @@ -1368,7 +1380,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 |