Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix #pragma message(), the message must be enclosed in parentheses
  preserve non-standard source references
  QSslConfiguration: fix crash when accessing null pointer
  properly parse ts contexts in obsolete messages
  move the MAGIC_OBSOLETE_REFERENCE hack to the xlf file handler
  Fix static build on Windows with MinGW.
  Reenable the reporting of CPU features.
  make qdoc3 boot-strappable again
  fix MinGW cross compilation with -debug-and-release
  Updated and new Slovenian translations for Qt 4.7
  Designer: Fix crash on unsupported Language/Country combination.
  Doc: Fixed qdoc warnings and generalized the date and time descriptions.
  Doc: Whitespace fixes.
  Doc: Fixed snippets in QML introduction broken in an earlier commit.
  doc: Fixed numerous qdoc warnings.

2 files changed, 16 insertions, 49 deletions

diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index 0b3b164..7a622f1 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -7758,18 +7758,21 @@ void QGraphicsItemPrivate::resetHeight()
 }
 
 /*!
-  \property QGraphicsObject::children
-  \internal
+    \property QGraphicsObject::children
+    \since 4.7
+    \internal
 */
 
 /*!
-  \property QGraphicsObject::width
-  \internal
+    \property QGraphicsObject::width
+    \since 4.7
+    \internal
 */
 
 /*!
-  \property QGraphicsObject::height
-  \internal
+    \property QGraphicsObject::height
+    \since 4.7
+    \internal
 */
 
 /*!
@@ -7985,24 +7988,6 @@ void QGraphicsItemPrivate::resetHeight()
 */
 
 /*!
-    \property QGraphicsObject::children
-    \since 4.7
-    \internal
-*/
-
-/*!
-    \property QGraphicsObject::width
-    \since 4.7
-    \internal
-*/
-
-/*!
-    \property QGraphicsObject::height
-    \since 4.7
-    \internal
-*/
-
-/*!
     \class QAbstractGraphicsShapeItem
     \brief The QAbstractGraphicsShapeItem class provides a common base for
     all path items.
diff --git a/src/gui/graphicsview/qgraphicstransform.cpp b/src/gui/graphicsview/qgraphicstransform.cpp
index bd3f2ef..1f155c6 100644
--- a/src/gui/graphicsview/qgraphicstransform.cpp
+++ b/src/gui/graphicsview/qgraphicstransform.cpp
@@ -346,21 +346,24 @@ void QGraphicsScale::applyTo(QMatrix4x4 *matrix) const
 
 /*!
     \fn QGraphicsScale::xScaleChanged()
+    \since 4.7
 
-    QGraphicsScale emits this signal when its xScale changes.
+    This signal is emitted whenever the \l xScale property changes.
 */
 
 /*!
     \fn QGraphicsScale::yScaleChanged()
+    \since 4.7
 
-    QGraphicsScale emits this signal when its yScale changes.
+    This signal is emitted whenever the \l yScale property changes.
 */
 
 /*!
     \fn QGraphicsScale::zScaleChanged()
+    \since 4.7
 
-    QGraphicsScale emits this signal when its zScale changes.
-*/    
+    This signal is emitted whenever the \l zScale property changes.
+*/
 
 /*!
     \fn QGraphicsScale::scaleChanged()
@@ -583,27 +586,6 @@ void QGraphicsRotation::applyTo(QMatrix4x4 *matrix) const
     \sa QGraphicsRotation::axis
 */
 
-/*!
-    \fn QGraphicsScale::xScaleChanged()
-    \since 4.7
-
-    This signal is emitted whenever the \l xScale property changes.
-*/
-
-/*!
-    \fn QGraphicsScale::yScaleChanged()
-    \since 4.7
-
-    This signal is emitted whenever the \l yScale property changes.
-*/
-
-/*!
-    \fn QGraphicsScale::zScaleChanged()
-    \since 4.7
-
-    This signal is emitted whenever the \l zScale property changes.
-*/
-
 #include "moc_qgraphicstransform.cpp"
 
 QT_END_NAMESPACE