From 295b16da9289bdd261665006b1e5a2284196cb7e Mon Sep 17 00:00:00 2001 From: Takumi ASAKI Date: Mon, 30 Jul 2018 17:50:32 +0900 Subject: Doc: Fix Scene2D and Scene3D QML modules uri MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is additional fix for QTBUG-67370. And fix for Scene3D. Task-number: QTBUG-67370 Change-Id: Id362e60ac4072b7935ee86ff2a44e23018adc381 Reviewed-by: Topi Reiniö Reviewed-by: Paul Wicking --- src/doc/src/qt3d-module.qdoc | 8 ++++---- src/doc/src/qt3dscene3d-module.qdoc | 4 ++-- src/quick3d/imports/scene3d/scene3ditem.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/doc/src/qt3d-module.qdoc b/src/doc/src/qt3d-module.qdoc index da6ada1cc..12a2e8761 100644 --- a/src/doc/src/qt3d-module.qdoc +++ b/src/doc/src/qt3d-module.qdoc @@ -83,8 +83,8 @@ import Qt3D.Logic 2.0 import Qt3D.Extras 2.0 import Qt3D.Animation 2.9 - import Qt3D.Scene2D 2.9 - import Qt3D.Scene3D 2.9 + import QtQuick.Scene2D 2.9 + import QtQuick.Scene3D 2.0 \endcode \section1 QML Types @@ -111,9 +111,9 @@ \noautolist \section2 Qt 3D Scene2D Module - \generatelist {qmltypesbymodule Qt3D.Scene2D} + \generatelist {qmltypesbymodule QtQuick.Scene2D} \noautolist \section2 Qt 3D Scene3D Module - \generatelist {qmltypesbymodule Qt3D.Scene3D} + \generatelist {qmltypesbymodule QtQuick.Scene3D} */ diff --git a/src/doc/src/qt3dscene3d-module.qdoc b/src/doc/src/qt3dscene3d-module.qdoc index a9ae3650d..aa6939ef9 100644 --- a/src/doc/src/qt3dscene3d-module.qdoc +++ b/src/doc/src/qt3dscene3d-module.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \qmlmodule Qt3D.Scene3D 2.0 + \qmlmodule QtQuick.Scene3D 2.0 \preliminary \title Qt 3D Scene3D QML Types \ingroup qmlmodules @@ -37,6 +37,6 @@ To import and use the module's QML types, use the following statement: \badcode - import Qt3D.Scene3D 2.0 + import QtQuick.Scene3D 2.0 \endcode */ diff --git a/src/quick3d/imports/scene3d/scene3ditem.cpp b/src/quick3d/imports/scene3d/scene3ditem.cpp index 740fda294..2f791b202 100644 --- a/src/quick3d/imports/scene3d/scene3ditem.cpp +++ b/src/quick3d/imports/scene3d/scene3ditem.cpp @@ -87,7 +87,7 @@ namespace Qt3DRender { /*! \qmltype Scene3D \inherits Item - \inqmlmodule Qt3D.Scene3D + \inqmlmodule QtQuick.Scene3D \preliminary -- cgit v1.2.3