diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-25 11:47:24 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-25 12:52:15 +0200 |
| commit | 8e6ecb56e5d61ce661422779c9d9cbf22f081a34 (patch) | |
| tree | 227aeb360800a49de58472bd39bc5f4c596c1b15 /src/declarative/items/qsgimage.cpp | |
| parent | c9224b6cf5cceb7d5314f7504d44bfe72bc66950 (diff) | |
| parent | 0d84e957297b4ffa6ab5b0b5bcf8b169d567d298 (diff) | |
Merge branch 'master' into refactor
Conflicts:
src/declarative/items/qsgcanvas.cpp
src/declarative/items/qsgitem.cpp
src/declarative/items/qsgtextnode.cpp
tests/auto/declarative/examples/examples.pro
tools/qmlviewer/qmlviewer.pro
Change-Id: Icbb0ef5dc79b658c62fd2b2c25a66c9bb3cbeb10
Diffstat (limited to 'src/declarative/items/qsgimage.cpp')
| -rw-r--r-- | src/declarative/items/qsgimage.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/declarative/items/qsgimage.cpp b/src/declarative/items/qsgimage.cpp index dc5c8d11c7..cb12c177cd 100644 --- a/src/declarative/items/qsgimage.cpp +++ b/src/declarative/items/qsgimage.cpp @@ -95,7 +95,6 @@ QSGImagePrivate::QSGImagePrivate() /*! \qmlclass Image QSGImage - \since QtQuick 1.0 \inqmlmodule QtQuick 2 \ingroup qml-basic-visual-elements \brief The Image element displays an image in a declarative user interface @@ -446,7 +445,6 @@ qreal QSGImage::paintedHeight() const /*! \qmlproperty bool QtQuick2::Image::cache - \since Quick 1.1 Specifies whether the image should be cached. The default value is true. Setting \a cache to false is useful when dealing with large images, @@ -455,7 +453,6 @@ qreal QSGImage::paintedHeight() const /*! \qmlproperty bool QtQuick2::Image::mirror - \since Quick 1.1 This property holds whether the image should be horizontally inverted (effectively displaying a mirrored image). @@ -466,7 +463,6 @@ qreal QSGImage::paintedHeight() const /*! \qmlproperty enumeration QtQuick2::Image::horizontalAlignment \qmlproperty enumeration QtQuick2::Image::verticalAlignment - \since Quick 2.0 Sets the horizontal and vertical alignment of the image. By default, the image is top-left aligned. |