diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-26 21:42:57 (GMT) |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-26 21:42:57 (GMT) |
| commit | e028a54690f2fedfae6da19fb24b7401e4a71e56 (patch) | |
| tree | 72c038e84d9fb1063c970a121949d898442c5648 /src/declarative/graphicsitems/qdeclarativeborderimage.cpp | |
| parent | d54407928be05781ede2358baba2f2f91749cc80 (diff) | |
| parent | 6661f5c2222c145d854e225076195b37672637d2 (diff) | |
| download | Qt-e028a54690f2fedfae6da19fb24b7401e4a71e56.zip Qt-e028a54690f2fedfae6da19fb24b7401e4a71e56.tar.gz Qt-e028a54690f2fedfae6da19fb24b7401e4a71e56.tar.bz2 | |
Merge branch 4.7 into qt-4.8-from-4.7
Conflicts:
doc/src/index.qdoc
src/xmlpatterns/expr/qevaluationcache_p.h
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeborderimage.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeborderimage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp index 4b4efb6..9c274e9 100644 --- a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp +++ b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp @@ -215,7 +215,7 @@ QDeclarativeBorderImage::~QDeclarativeBorderImage() /*! \qmlproperty bool BorderImage::cache - \since QtQuick 1.1 + \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, @@ -224,7 +224,7 @@ QDeclarativeBorderImage::~QDeclarativeBorderImage() /*! \qmlproperty bool BorderImage::mirror - \since QtQuick 1.1 + \since Quick 1.1 This property holds whether the image should be horizontally inverted (effectively displaying a mirrored image). |