diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2015-06-21 14:57:33 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-06-21 14:57:33 +0100 |
| commit | 099f466847039954c581030c2a5aa2bfce08e0eb (patch) | |
| tree | 194a94d15a68b0c38d2d45c12275afb2c91b9831 /src/render/frontend/qlayer.cpp | |
| parent | 7bbd402770fa27f944840c95b6a3c6121883bc58 (diff) | |
| parent | b71f09d143002f15abfd4a407651544942a75c44 (diff) | |
Merge branch '5.5.0' into 5.5
Conflicts:
src/input/qkeyboardcontroller.cpp
Change-Id: Ifb0b5af165fb11dbe07849f34d3b93d9cc78eeaa
Diffstat (limited to 'src/render/frontend/qlayer.cpp')
| -rw-r--r-- | src/render/frontend/qlayer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/render/frontend/qlayer.cpp b/src/render/frontend/qlayer.cpp index 979ef4b20..76a83f992 100644 --- a/src/render/frontend/qlayer.cpp +++ b/src/render/frontend/qlayer.cpp @@ -52,7 +52,7 @@ QLayerPrivate::QLayerPrivate() /*! \class QLayer - \inmodule Qt3DRender + \inmodule Qt3DRenderer \since 5.5 \brief The QLayer class provides ... */ @@ -61,7 +61,7 @@ QLayerPrivate::QLayerPrivate() \qmltype Layer \instantiates Qt3D::QLayer \inherits Component3D - \inqmlmodule Qt3D.Render + \inqmlmodule Qt3D.Renderer \since 5.5 \brief For ... */ @@ -103,7 +103,7 @@ QLayer::QLayer(QLayerPrivate &dd, QNode *parent) */ /*! - \qmlproperty stringlist Qt3D.Render::Layer::names + \qmlproperty stringlist Qt3D.Renderer::Layer::names */ |