diff options
| author | Antti Määttä <antti.maatta@qt.io> | 2019-06-03 11:43:55 +0300 |
|---|---|---|
| committer | Antti Määttä <antti.maatta@qt.io> | 2019-06-03 11:43:55 +0300 |
| commit | d3d583c73018965c418e625e16750eb5e2da556c (patch) | |
| tree | c1ccc7d25b292b66e6da57585f8de31689fbb284 | |
| parent | 77d441c8b50fa711d61a86a7272c558cf2e93091 (diff) | |
Remove subPresentationSettings property
Task-number: QT3DS-3547
Change-Id: I285839af0b42a057ad37d822bd3d208f4985634e
Reviewed-by: Janne Kangas <janne.kangas@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| -rw-r--r-- | src/Runtime/ogl-runtime/src/api/studio3dqml/q3dspresentationitem.cpp | 12 | ||||
| -rw-r--r-- | src/Runtime/ogl-runtime/src/api/studio3dqml/q3dspresentationitem_p.h | 1 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/Runtime/ogl-runtime/src/api/studio3dqml/q3dspresentationitem.cpp b/src/Runtime/ogl-runtime/src/api/studio3dqml/q3dspresentationitem.cpp index 407739e5..6372f2fa 100644 --- a/src/Runtime/ogl-runtime/src/api/studio3dqml/q3dspresentationitem.cpp +++ b/src/Runtime/ogl-runtime/src/api/studio3dqml/q3dspresentationitem.cpp @@ -69,6 +69,11 @@ QT_BEGIN_NAMESPACE is changed in the presentation by animation timeline, by behavior scripts or by a \l{DataInput}. + The Presentation type handles child objects of the types \l Element, \l + SceneElement, \l DataInput, and \l SubPresentationSettings specially. These + will get automatically associated with the presentation and can control + certain aspects of it from that point on. + From the API point of view Presentation corresponds to the main presentation. The source property can refer either to a \c{.uia} or \c{.uip} file. When specifying a file with \c{.uip} @@ -86,12 +91,9 @@ Q3DSPresentationItem::~Q3DSPresentationItem() { } -// #TODO: QT3DS-3565 subPresentationSettings is missing documentation /*! - \qmlproperty SubPresentationSettings Presentation::subPresentationSettings - - Note: This property is read-only. - */ + Returns the \l SubPresentationSettings associated with this presentation. +*/ Q3DSSubPresentationSettings *Q3DSPresentationItem::subPresentationSettings() const { return m_subPresentationSettings; diff --git a/src/Runtime/ogl-runtime/src/api/studio3dqml/q3dspresentationitem_p.h b/src/Runtime/ogl-runtime/src/api/studio3dqml/q3dspresentationitem_p.h index 757f34fa..216f73a0 100644 --- a/src/Runtime/ogl-runtime/src/api/studio3dqml/q3dspresentationitem_p.h +++ b/src/Runtime/ogl-runtime/src/api/studio3dqml/q3dspresentationitem_p.h @@ -52,7 +52,6 @@ class Q3DSPresentationItem : public Q3DSPresentation { Q_OBJECT Q_PROPERTY(QQmlListProperty<QObject> qmlChildren READ qmlChildren DESIGNABLE false) - Q_PROPERTY(Q3DSSubPresentationSettings *subPresentationSettings READ subPresentationSettings CONSTANT) Q_CLASSINFO("DefaultProperty", "qmlChildren") public: |