diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-07-23 16:59:48 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-07-23 16:59:48 +0000 |
| commit | bd452c3d25778dc646b8f0aff70fa6a8c7e0ebcc (patch) | |
| tree | 9266960d7017bb3dc9e29abe7e7337228f936387 /src/quick | |
| parent | 40b9fb8946837a01710814c28fd0f04edba631ad (diff) | |
| parent | 5931caca23709ed0b2583ca2fd268191d06a23ef (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/doc/qtquick.qdocconf | 3 | ||||
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsggeometry.cpp | 10 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf index afe1b9708f..7f43dc2c31 100644 --- a/src/quick/doc/qtquick.qdocconf +++ b/src/quick/doc/qtquick.qdocconf @@ -67,7 +67,8 @@ excludedirs += ../../imports/models \ examples.fileextensions += "*.qm" -manifestmeta.thumbnail.names += "QtQuick/Threaded ListModel Example" +manifestmeta.thumbnail.names += "QtQuick/Threaded ListModel Example" \ + "QtQuick/QML Dynamic View Ordering Tutorial*" navigation.landingpage = "Qt Quick" navigation.cppclassespage = "Qt Quick C++ Classes" diff --git a/src/quick/scenegraph/coreapi/qsggeometry.cpp b/src/quick/scenegraph/coreapi/qsggeometry.cpp index 3f54e13c52..1fd37be84a 100644 --- a/src/quick/scenegraph/coreapi/qsggeometry.cpp +++ b/src/quick/scenegraph/coreapi/qsggeometry.cpp @@ -522,7 +522,8 @@ void QSGGeometry::setDrawingMode(GLenum mode) /*! Gets the current line or point width or to be used for this geometry. This property only applies to line width when the drawingMode is \c GL_LINES, \c GL_LINE_STRIP, or - \c GL_LINE_LOOP, and only applies to point size when the drawingMode is \c GL_POINTS. + \c GL_LINE_LOOP. For desktop OpenGL, it also applies to point size when the drawingMode + is \c GL_POINTS. The default value is \c 1.0 @@ -536,7 +537,12 @@ float QSGGeometry::lineWidth() const /*! Sets the line or point width to be used for this geometry to \a width. This property only applies to line width when the drawingMode is \c GL_LINES, \c GL_LINE_STRIP, or - \c GL_LINE_LOOP, and only applies to point size when the drawingMode is \c GL_POINTS. + \c GL_LINE_LOOP. For Desktop OpenGL, it also applies to point size when the drawingMode + is \c GL_POINTS. + + \note How line width and point size are treated is implementation dependent: The application + should not rely on these, but rather create triangles or similar to draw areas. On OpenGL ES, + line width support is limited and point size is unsupported. \sa lineWidth(), drawingMode() */ |