diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2012-07-30 11:09:23 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-13 15:06:46 +0200 |
| commit | 3ddf7f1cf638091c8c7c7380bf0414dcc1145d2c (patch) | |
| tree | 24ca7353ee789e5ea0ffa372eb899e6d2e93b9c3 /src/quick | |
| parent | 917a2cbc76a8433e550770b1414153ab16215381 (diff) | |
Three scene graph examples with docs.
How to make a custom QSGGeometry, how to use QSGSimpleMaterial and how
to use render with raw GL.
Change-Id: I3e5a32b6ae12d7d781c11050ed26a54845e92cca
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/doc/qtquick.qdocconf | 7 | ||||
| -rw-r--r-- | src/quick/items/qquickwindow.cpp | 2 | ||||
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsggeometry.cpp | 2 | ||||
| -rw-r--r-- | src/quick/scenegraph/util/qsgsimplematerial.cpp | 2 |
4 files changed, 9 insertions, 4 deletions
diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf index 0c6e00f949..24acb3e6aa 100644 --- a/src/quick/doc/qtquick.qdocconf +++ b/src/quick/doc/qtquick.qdocconf @@ -84,14 +84,15 @@ codeindent = 1 headerdirs += .. -sourcedirs += .. +sourcedirs += .. ../../../examples/quick/doc exampledirs += ../../../ \ - ../../../examples \ + ../../../examples/ \ ../ \ snippets -imagedirs += images + +imagedirs += images ../../../examples/quick/doc/images #add qml sources because of dependencies headerdirs += ../../qml diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index 3e1de8b2f0..ca94570a3c 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -887,6 +887,8 @@ void QQuickWindowPrivate::cleanup(QSGNode *n) may result in the entire scene graph and its OpenGL context being deleted. The sceneGraphInvalidated() signal will be emitted when this happens. + \sa {OpenGL Under QML Example} + */ QQuickWindow::QQuickWindow(QWindow *parent) : QWindow(*(new QQuickWindowPrivate), parent) diff --git a/src/quick/scenegraph/coreapi/qsggeometry.cpp b/src/quick/scenegraph/coreapi/qsggeometry.cpp index 54c5100490..8855e5c8c2 100644 --- a/src/quick/scenegraph/coreapi/qsggeometry.cpp +++ b/src/quick/scenegraph/coreapi/qsggeometry.cpp @@ -284,7 +284,7 @@ const QSGGeometry::AttributeSet &QSGGeometry::defaultAttributes_ColoredPoint2D() setIndexDataPattern() functions. Whether this hint is respected or not is implementation specific. - \sa QSGGeometryNode + \sa QSGGeometryNode, {Custom Geometry Example} */ diff --git a/src/quick/scenegraph/util/qsgsimplematerial.cpp b/src/quick/scenegraph/util/qsgsimplematerial.cpp index 1a25fac67f..73f1a2da17 100644 --- a/src/quick/scenegraph/util/qsgsimplematerial.cpp +++ b/src/quick/scenegraph/util/qsgsimplematerial.cpp @@ -140,6 +140,8 @@ renderer internally uses to identify this shader. For this reason, the unique QSGSimpleMaterialShader implemenation must be instantiated with a unique C++ type. + + \sa {Simple Material Example} */ /*! |