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

3 files changed, 18 insertions, 0 deletions

diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index 099fdf4..58f6537 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -1589,6 +1589,7 @@ QVariant::QVariant(const char *val)
   \fn QVariant::QVariant(float val)
 
     Constructs a new variant with a floating point value, \a val.
+    \since 4.6
 */
 
 /*!
diff --git a/src/corelib/tools/qscopedpointer.cpp b/src/corelib/tools/qscopedpointer.cpp
index 7efd979..44238a8 100644
--- a/src/corelib/tools/qscopedpointer.cpp
+++ b/src/corelib/tools/qscopedpointer.cpp
@@ -119,6 +119,10 @@ QT_BEGIN_NAMESPACE
     \sa QSharedPointer
 */
 
+/*! \typedef QScopedPointer::pointer
+  \internal
+ */
+
 /*!
     \fn QScopedPointer::QScopedPointer(T *p = 0)
 
diff --git a/src/corelib/tools/qshareddata.cpp b/src/corelib/tools/qshareddata.cpp
index 3d1a339..85b8244 100644
--- a/src/corelib/tools/qshareddata.cpp
+++ b/src/corelib/tools/qshareddata.cpp
@@ -231,6 +231,15 @@ QT_BEGIN_NAMESPACE
     \sa QSharedData, QExplicitlySharedDataPointer, QScopedPointer, QSharedPointer
 */
 
+/*! \typedef QSharedDataPointer::Type
+    This is the type of the shared data object. The \e{d pointer}
+    points to an object of this type.
+ */
+
+/*! \typedef QSharedDataPointer::pointer
+  \internal
+ */
+
 /*! \fn T& QSharedDataPointer::operator*()
     Provides access to the shared data object's members.
     This function calls detach().
@@ -552,4 +561,8 @@ QT_BEGIN_NAMESPACE
     points to an object of this type.
 */
 
+/*! \typedef QExplicitlySharedDataPointer::pointer
+  \internal
+ */
+
 QT_END_NAMESPACE