Merge remote branch 'mainline/4.6' into 4.6

3 files changed, 37 insertions, 9 deletions

diff --git a/src/corelib/tools/qcontiguouscache.cpp b/src/corelib/tools/qcontiguouscache.cpp
index dd7cab6..dab7327 100644
--- a/src/corelib/tools/qcontiguouscache.cpp
+++ b/src/corelib/tools/qcontiguouscache.cpp
@@ -150,20 +150,45 @@ MyRecord record(int row) const
 */
 
 /*! \fn void QContiguousCache::detach()
-
     \internal
 */
 
 /*! \fn bool QContiguousCache::isDetached() const
-
     \internal
 */
 
 /*! \fn void QContiguousCache::setSharable(bool sharable)
-
     \internal
 */
 
+/*! \typedef QContiguousCache::value_type
+  \internal
+ */
+
+/*! \typedef QContiguousCache::pointer
+  \internal
+ */
+
+/*! \typedef QContiguousCache::const_pointer
+  \internal
+ */
+
+/*! \typedef QContiguousCache::reference
+  \internal
+ */
+
+/*! \typedef QContiguousCache::const_reference
+  \internal
+ */
+
+/*! \typedef QContiguousCache::difference_type
+  \internal
+ */
+
+/*! \typedef QContiguousCache::size_type
+  \internal
+ */
+
 /*! \fn QContiguousCache<T> &QContiguousCache::operator=(const QContiguousCache<T> &other)
 
     Assigns \a other to this cache and returns a reference to this cache.
diff --git a/src/corelib/tools/qscopedpointer.cpp b/src/corelib/tools/qscopedpointer.cpp
index a3ca2c3..22e9bdf 100644
--- a/src/corelib/tools/qscopedpointer.cpp
+++ b/src/corelib/tools/qscopedpointer.cpp
@@ -174,18 +174,20 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \fn bool QScopedPointer::operator==(const QScopedPointer<T, Cleanup> &other) const
+    \fn bool operator==(const QScopedPointer<T, Cleanup> &lhs, const QScopedPointer<T, Cleanup> &rhs)
 
-    Equality operator. Returns true if the scoped pointer \a other
-    is pointing to the same object as this pointer, otherwise returns false.
+    Equality operator. Returns true if the scoped pointers
+    \a lhs and \a rhs are pointing to the same object.
+    Otherwise returns false.
 */
 
 
 /*!
-    \fn bool QScopedPointer::operator!=(const QScopedPointer<T, Cleanup> &other) const
+    \fn bool operator!=(const QScopedPointer<T, Cleanup> &lhs, const QScopedPointer<T, Cleanup> &rhs)
 
-    Inequality operator. Returns true if the scoped pointer \a other
-    is not pointing to the same object as this pointer, otherwise returns false.
+    Inequality operator. Returns true if the scoped pointers
+    \a lhs and \a rhs are \e not pointing to the same object.
+    Otherwise returns false.
 */
 
 /*!
diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h
index 930b006..f0de98d 100644
--- a/src/corelib/tools/qvector.h
+++ b/src/corelib/tools/qvector.h
@@ -69,6 +69,7 @@ struct Q_CORE_EXPORT QVectorData
     // workaround for bug in gcc 3.4.2
     uint sharable;
     uint capacity;
+    uint reserved;
 #else
     uint sharable : 1;
     uint capacity : 1;