diff options
Diffstat (limited to 'src/quick/doc')
-rw-r--r-- | src/quick/doc/images/gridLayout_aligncenter.png | bin | 0 -> 476 bytes | |||
-rw-r--r-- | src/quick/doc/images/gridLayout_aligntop.png | bin | 0 -> 472 bytes | |||
-rw-r--r-- | src/quick/doc/images/gridLayout_aligntopleft.png | bin | 0 -> 477 bytes | |||
-rw-r--r-- | src/quick/doc/images/screen-and-window-dimensions.jpg | bin | 0 -> 50403 bytes | |||
-rw-r--r-- | src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc | 26 | ||||
-rw-r--r-- | src/quick/doc/src/qmltypereference.qdoc | 13 |
6 files changed, 25 insertions, 14 deletions
diff --git a/src/quick/doc/images/gridLayout_aligncenter.png b/src/quick/doc/images/gridLayout_aligncenter.png Binary files differnew file mode 100644 index 0000000000..f31ed25e79 --- /dev/null +++ b/src/quick/doc/images/gridLayout_aligncenter.png diff --git a/src/quick/doc/images/gridLayout_aligntop.png b/src/quick/doc/images/gridLayout_aligntop.png Binary files differnew file mode 100644 index 0000000000..5b752b1d19 --- /dev/null +++ b/src/quick/doc/images/gridLayout_aligntop.png diff --git a/src/quick/doc/images/gridLayout_aligntopleft.png b/src/quick/doc/images/gridLayout_aligntopleft.png Binary files differnew file mode 100644 index 0000000000..5a4a2fe211 --- /dev/null +++ b/src/quick/doc/images/gridLayout_aligntopleft.png diff --git a/src/quick/doc/images/screen-and-window-dimensions.jpg b/src/quick/doc/images/screen-and-window-dimensions.jpg Binary files differnew file mode 100644 index 0000000000..98c8b06df6 --- /dev/null +++ b/src/quick/doc/images/screen-and-window-dimensions.jpg diff --git a/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc b/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc index 099c7eb443..40d77c3d9b 100644 --- a/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc +++ b/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc @@ -106,7 +106,7 @@ during the updatePaintNode() call. The rule of thumb is to only use classes with the "QSG" prefix inside the QQuickItem::updatePaintNode() function. -For more details, see the \l {Custom Geometry Example}. +For more details, see the \l {Scene Graph - Custom Geometry}. \section3 Preprocessing @@ -140,7 +140,7 @@ type. Below is a complete list of material classes: \annotatedlist{qtquick-scenegraph-materials} -For more details, see the \l {Simple Material Example} +For more details, see the \l {Scene Graph - Simple Material} \section2 Convenience Nodes @@ -280,21 +280,19 @@ needed to perform the rendering. The downside is that Qt Quick decides when to call the signals and this is the only time the OpenGL application is allowed to draw. -The \l {OpenGL Under QML} example gives an example on how to use use -these signals. - +The \l {Scene Graph - OpenGL Under QML} example gives an example on +how to use use these signals. The other alternative is to create a FramebufferObject, render into it and use the result as a textured node in the scene graph, for instance -using a QSGSimpleTextureNode. A simple way of doing the same is to use -a QQuickPaintedItem with QQuickPaintedItem::FramebufferObject as -render target and by calling QPainter::beginNativePainting() before -the OpenGL rendering and QPainter::endNativePainting() after. When -OpenGL content is integrated with a texture and FramebufferObject, the -application has more control over when the content is rendered. For -instance, the application can create a second QOpenGLContext on the -GUI thread which shares memory with the scene graph's OpenGL context -and drive the rendering manually. +using a QSGSimpleTextureNode. The \l {Scene Graph - Rendering FBOs} +and \l {Scene Graph - Rendering FBOs in a thread} examples show how +this can be done in an optimal manner. + +A simple way of doing the same is to use a QQuickPaintedItem with +QQuickPaintedItem::FramebufferObject as render target and by calling +QPainter::beginNativePainting() before the OpenGL rendering and +QPainter::endNativePainting() after. \warning When mixing OpenGL content with scene graph rendering, it is important the application does not leave the OpenGL context in a state diff --git a/src/quick/doc/src/qmltypereference.qdoc b/src/quick/doc/src/qmltypereference.qdoc index 9604b927a8..a627cfe7b5 100644 --- a/src/quick/doc/src/qmltypereference.qdoc +++ b/src/quick/doc/src/qmltypereference.qdoc @@ -285,6 +285,19 @@ Data Storage */ /*! +\qmlmodule QtQuick 2 +\brief The QtQuick 2 module provides graphical primitives for use in QML. + +The QtQuick 2 module provides graphical primitive types. They can be used with the following import +\code +import QtQuick 2.1 +\endcode + +For a more detailed listing of types in the QtQuick 2 import, see the \l{qtquick-qmltypereference.html}{QtQuick 2 type reference page}. +For more details about the QtQuick 2 module, see the \l{QtQuick} module page. +*/ + +/*! \qmlbasictype color \ingroup qtquickbasictypes \brief an ARGB color value. |