diff options
author | Martin Jones <martin.jones@nokia.com> | 2009-11-24 07:24:43 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2009-11-24 07:24:43 (GMT) |
commit | 1f8085ce84dad88c27c8fffed84250baf20ee89c (patch) | |
tree | 02cd58e7c0b3630a22a37aca085a33c4bd784972 /src/declarative | |
parent | c711113555a815db293c7e0de9cfae9a9a07c681 (diff) | |
download | Qt-1f8085ce84dad88c27c8fffed84250baf20ee89c.zip Qt-1f8085ce84dad88c27c8fffed84250baf20ee89c.tar.gz Qt-1f8085ce84dad88c27c8fffed84250baf20ee89c.tar.bz2 |
Docs.
Diffstat (limited to 'src/declarative')
-rw-r--r-- | src/declarative/graphicsitems/qmlgraphicsimage.cpp | 9 | ||||
-rw-r--r-- | src/declarative/graphicsitems/qmlgraphicslistview.cpp | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicsimage.cpp b/src/declarative/graphicsitems/qmlgraphicsimage.cpp index 42fd910..2161ed6 100644 --- a/src/declarative/graphicsitems/qmlgraphicsimage.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsimage.cpp @@ -141,6 +141,15 @@ QmlGraphicsImage::~QmlGraphicsImage() { } +/*! + \qmlproperty QPixmap Image::pixmap + + This property holds the QPixmap image to display. + + This is useful for displaying images provided by a C++ implementation, + for example, a model may provide a data role of type QPixmap. +*/ + QPixmap QmlGraphicsImage::pixmap() const { Q_D(const QmlGraphicsImage); diff --git a/src/declarative/graphicsitems/qmlgraphicslistview.cpp b/src/declarative/graphicsitems/qmlgraphicslistview.cpp index c6291f2..e05ae66 100644 --- a/src/declarative/graphicsitems/qmlgraphicslistview.cpp +++ b/src/declarative/graphicsitems/qmlgraphicslistview.cpp @@ -1318,7 +1318,7 @@ void QmlGraphicsListView::setHighlightFollowsCurrentItem(bool autoHighlight) /*! \qmlproperty real ListView::preferredHighlightBegin \qmlproperty real ListView::preferredHighlightEnd - \qmlproperty bool ListView::highlightRangeMode + \qmlproperty enumeration ListView::highlightRangeMode These properties set the preferred range of the highlight (current item) within the view. |