diff options
| author | axis <qt-info@nokia.com> | 2010-02-26 09:05:39 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-02-26 09:05:39 (GMT) |
| commit | 5e9382c018e231c5e2ef49dd8a38eaff535b9837 (patch) | |
| tree | 89f13d31d5804c38999fdefd0e2aca39d305f91c /src/svg/qgraphicssvgitem.cpp | |
| parent | 11e54877f87ff97039452f117d40ec17eefbcbff (diff) | |
| parent | 53e7dda038e9251ca7380d3717709764c580192e (diff) | |
| download | Qt-5e9382c018e231c5e2ef49dd8a38eaff535b9837.zip Qt-5e9382c018e231c5e2ef49dd8a38eaff535b9837.tar.gz Qt-5e9382c018e231c5e2ef49dd8a38eaff535b9837.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60
Conflicts:
qmake/generators/symbian/initprojectdeploy_symbian.cpp
qmake/generators/symbian/symmake_abld.h
Diffstat (limited to 'src/svg/qgraphicssvgitem.cpp')
| -rw-r--r-- | src/svg/qgraphicssvgitem.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/svg/qgraphicssvgitem.cpp b/src/svg/qgraphicssvgitem.cpp index 7e80e50..69ff7a3 100644 --- a/src/svg/qgraphicssvgitem.cpp +++ b/src/svg/qgraphicssvgitem.cpp @@ -267,6 +267,7 @@ int QGraphicsSvgItem::type() const /*! \property QGraphicsSvgItem::maximumCacheSize + \since 4.6 This property holds the maximum size of the device coordinate cache for this item. @@ -312,7 +313,8 @@ QSize QGraphicsSvgItem::maximumCacheSize() const /*! \property QGraphicsSvgItem::elementId - + \since 4.6 + This property holds the element's XML ID. */ |