Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui

Conflicts:
	configure

3 files changed, 8 insertions, 14 deletions

diff --git a/src/gui/graphicsview/qgraphicsanchorlayout.cpp b/src/gui/graphicsview/qgraphicsanchorlayout.cpp
index fdb1708..ffbb67c 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout.cpp
+++ b/src/gui/graphicsview/qgraphicsanchorlayout.cpp
@@ -118,9 +118,13 @@ QGraphicsAnchor::~QGraphicsAnchor()
 }
 
 /*!
-    Set the spacing for the anchor to \a spacing.
+    \property QGraphicsAnchor::spacing
+    \brief the space between items in the QGraphicsAnchorLayout.
 
-    \sa spacing(), unsetSpacing()
+    Depending on the anchor type, the default spacing is either
+    0 or a value returned from the style.
+
+    \sa QGraphicsAnchorLayout::anchor()
 */
 void QGraphicsAnchor::setSpacing(qreal spacing)
 {
@@ -128,23 +132,12 @@ void QGraphicsAnchor::setSpacing(qreal spacing)
     d->setSpacing(spacing);
 }
 
-/*!
-    Returns the spacing for the anchor
-
-    \sa setSpacing()
-*/
 qreal QGraphicsAnchor::spacing() const
 {
     Q_D(const QGraphicsAnchor);
     return d->spacing();
 }
 
-/*!
-    Resets the spacing of the anchor point to be the default spacing. Depending on the anchor type,
-    the default spacing is either 0 or a value returned from the style.
-
-    \sa setSpacing(), spacing(), QGraphicsAnchorLayout::anchor()
-*/
 void QGraphicsAnchor::unsetSpacing()
 {
     Q_D(QGraphicsAnchor);
diff --git a/src/gui/graphicsview/qgraphicsanchorlayout.h b/src/gui/graphicsview/qgraphicsanchorlayout.h
index d9a87ba..99dbf92 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout.h
+++ b/src/gui/graphicsview/qgraphicsanchorlayout.h
@@ -61,7 +61,7 @@ class QGraphicsAnchorLayoutPrivate;
 class Q_GUI_EXPORT QGraphicsAnchor : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing)
+    Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing RESET unsetSpacing)
 public:
     void setSpacing(qreal spacing);
     void unsetSpacing();
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index 912cfb6..d766acc 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -609,6 +609,7 @@
 
 /*!
     \enum QGraphicsItem::PanelModality
+    \since 4.6
 
     This enum specifies the behavior of a modal panel. A modal panel
     is one that blocks input to other panels. Note that items that