diff options
| author | Paul Wicking <paul.wicking@qt.io> | 2018-07-30 13:41:49 +0200 |
|---|---|---|
| committer | Paul Wicking <paul.wicking@qt.io> | 2018-07-30 14:17:40 +0000 |
| commit | 608de36fd8802b53d028a92b1984c40321435b0a (patch) | |
| tree | 3ed577a2b416c46afb1f3a31a252f3161c4fa6a5 | |
| parent | 490b77ac1ffaa6a74f4a8d89bf73764dcdae9188 (diff) | |
Doc: Use correct module name
QML: Importing Qt3D.Scene2D doesn't work, QtQuick.Scene2D does.
CPP: Specify header file, as convenience header doesn't exist.
Task-number: QTBUG-67370
Change-Id: Ia53e92c076f52bbb81b91370425279c44bf9e3c5
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
(cherry picked from commit 9b00bfe82f03ca6d39a004cc380fba144509da2b)
| -rw-r--r-- | src/doc/src/qt3dscene2d-module.qdoc | 5 | ||||
| -rw-r--r-- | src/quick3d/quick3dscene2d/items/qscene2d.cpp | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/doc/src/qt3dscene2d-module.qdoc b/src/doc/src/qt3dscene2d-module.qdoc index a389a8ed0..e1a91512f 100644 --- a/src/doc/src/qt3dscene2d-module.qdoc +++ b/src/doc/src/qt3dscene2d-module.qdoc @@ -79,7 +79,8 @@ */ /*! - \qmlmodule Qt3D.Scene2D 2.9 + \qmlmodule QtQuick.Scene2D 2.9 + \preliminary \title Qt 3D Scene2D QML Types \ingroup qmlmodules \ingroup qt3d-qmlmodules @@ -89,6 +90,6 @@ To import and use the module's QML types, use the following statement: \badcode - import Qt3D.Scene2D 2.9 + import QtQuick.Scene2D 2.9 \endcode */ diff --git a/src/quick3d/quick3dscene2d/items/qscene2d.cpp b/src/quick3d/quick3dscene2d/items/qscene2d.cpp index 52e2be094..06e9eecd4 100644 --- a/src/quick3d/quick3dscene2d/items/qscene2d.cpp +++ b/src/quick3d/quick3dscene2d/items/qscene2d.cpp @@ -54,6 +54,7 @@ namespace Quick { /*! \class Qt3DRender::Quick::QScene2D + \inheaderfile Qt3DQuickScene2D/QScene2D \inmodule Qt3DScene2D \brief This class enables rendering qml into a texture, which then can be @@ -73,7 +74,7 @@ namespace Quick { /*! \qmltype Scene2D - \inqmlmodule Qt3D.Scene2D + \inqmlmodule QtQuick.Scene2D \since 5.9 \instantiates Qt3DRender::Quick::QScene2D |