diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-27 16:32:49 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-27 16:32:49 +0200 |
commit | d75030a620274bc450f7d11edc02efab2bbf7f4e (patch) | |
tree | a06b7b199b8fa99105610c1844584c4bbc006fcf /src/render/lights | |
parent | 08bcfc398d51e0e23783a4f02623e5b27e675092 (diff) | |
parent | d48e15d235645cbd6b08cd5fc5eb7ae84678c1fe (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: Iae5fa92dfdf8012315c043e20950368e42451e20
Diffstat (limited to 'src/render/lights')
-rw-r--r-- | src/render/lights/qabstractlight.cpp | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/src/render/lights/qabstractlight.cpp b/src/render/lights/qabstractlight.cpp index e5376f712..5ad16d3b4 100644 --- a/src/render/lights/qabstractlight.cpp +++ b/src/render/lights/qabstractlight.cpp @@ -67,9 +67,22 @@ QAbstractLightPrivate::~QAbstractLightPrivate() } /*! + \qmlproperty enumeration Qt3D.Render::Light::type + \readonly + + Holds the particular type of light. + + \value Light.PointLight + A point light + \value Light.DirectionalLight + A directional light + \value Light.SpotLight + a spot light +*/ +/*! \property Qt3DRender::QAbstractLight::type - Contains the type of light. + The type of light. */ /*! \enum Qt3DRender::QAbstractLight::Type @@ -118,6 +131,11 @@ QAbstractLight::Type QAbstractLight::type() const } /*! + * \qmlproperty QColor Qt3D.Render.Light::color + * + * Holds the current Light color. + */ +/*! * \property Qt3DRender::QAbstractLight::color * * Holds the current QAbstractLight color. @@ -138,6 +156,11 @@ void QAbstractLight::setColor(const QColor &c) } /*! + \qmlproperty float Qt3D.Render.Light::intensity + + Holds the current Light intensity. +*/ +/*! \property Qt3DRender::QAbstractLight::intensity Holds the current QAbstractLight intensity. |