diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2018-05-30 12:54:37 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2018-05-30 15:15:41 +0000 |
| commit | 44fd1fb48fbf677bddcd4a5de0b15c0db71899d2 (patch) | |
| tree | cb43fd7323f7d717aa910112297225d28548d5ed | |
| parent | bee4d0f31b190565ca75dd35c07870d92e8580c1 (diff) | |
Clarify docs for the running property
The meaning of running and presentationReady or presentationLoaded is
basically the same in 2.0.
Task-number: QT3DS-413
Change-Id: I97bfd585fce673ed9d7d470bda8a5a3d80c0b2f1
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
| -rw-r--r-- | src/imports/studio3d/q3dsstudio3ditem.cpp | 8 | ||||
| -rw-r--r-- | src/runtime/api/q3dssurfaceviewer.cpp | 8 | ||||
| -rw-r--r-- | src/runtime/api/q3dswidget.cpp | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/imports/studio3d/q3dsstudio3ditem.cpp b/src/imports/studio3d/q3dsstudio3ditem.cpp index 7b4c0eb..270de10 100644 --- a/src/imports/studio3d/q3dsstudio3ditem.cpp +++ b/src/imports/studio3d/q3dsstudio3ditem.cpp @@ -123,8 +123,8 @@ QT_BEGIN_NAMESPACE /*! \qmlsignal Studio3D::presentationReady() - This signal is emitted when the viewer has been initialized and the - presentation is ready to be shown. + This signal is emitted when the presentation has been loaded and is ready + to be shown. */ static bool engineCleanerRegistered = false; @@ -176,8 +176,8 @@ Q3DSPresentationItem *Q3DSStudio3DItem::presentation() const /*! \qmlproperty bool Studio3D::running - The value of this property is \c true when the viewer has been initialized - and the presentation is running. + The value of this property is \c true when the presentation has been loaded + and is ready to be shown. This property is read-only. */ diff --git a/src/runtime/api/q3dssurfaceviewer.cpp b/src/runtime/api/q3dssurfaceviewer.cpp index 8ead5af..09d590f 100644 --- a/src/runtime/api/q3dssurfaceviewer.cpp +++ b/src/runtime/api/q3dssurfaceviewer.cpp @@ -201,8 +201,8 @@ void Q3DSSurfaceViewer::destroy() /*! \fn Q3DSSurfaceViewer::presentationLoaded() - This signal is emitted when the viewer has been initialized and the - presentation is ready to be shown. + This signal is emitted when the presentation has been loaded and is ready + to be shown. */ /*! @@ -241,8 +241,8 @@ QString Q3DSSurfaceViewer::error() const /*! \property Q3DSSurfaceViewer::running - The value of this property is \c true when the viewer has been initialized - and the presentation is running. + The value of this property is \c true when the presentation has been loaded + and is ready to be shown. This property is read-only. */ diff --git a/src/runtime/api/q3dswidget.cpp b/src/runtime/api/q3dswidget.cpp index 7381ce5..2f7d6cd 100644 --- a/src/runtime/api/q3dswidget.cpp +++ b/src/runtime/api/q3dswidget.cpp @@ -97,8 +97,8 @@ Q3DSWidget::~Q3DSWidget() /*! \fn Q3DSWidget::presentationLoaded() - This signal is emitted when the viewer has been initialized and the - presentation is ready to be shown. + This signal is emitted when the presentation has been loaded and is ready + to be shown. */ /*! @@ -141,8 +141,8 @@ QString Q3DSWidget::error() const /*! \property Q3DSWidget::running - The value of this property is \c true when the viewer has been initialized - and the presentation is running. + The value of this property is \c true when the presentation has been loaded + and is ready to be shown. This property is read-only. */ |