Review of documentation.

Documentation has been updated, changes apply to Qt5 as well as Qt4.

Change-Id: I692869971bafffabbb9c323dc031f6d984c1adb9
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>

diff --git a/src/corelib/doc/snippets/pointer/pointer.cpp b/src/corelib/doc/snippets/pointer/pointer.cpp
index 31b4959..503f2df 100644 (file)
--- a/src/corelib/doc/snippets/pointer/pointer.cpp
+++ b/src/corelib/doc/snippets/pointer/pointer.cpp
@@ -53,7 +53,8 @@ int main(int argc, char *argv[])
 
 //! [1]
     if (label)
-//! [1] //! [2]
+//! [1]
+//! [2]
         label->show();
 //! [2]
     return 0;

diff --git a/src/corelib/kernel/qpointer.cpp b/src/corelib/kernel/qpointer.cpp
index 48710bb..b774b36 100644 (file)
--- a/src/corelib/kernel/qpointer.cpp
+++ b/src/corelib/kernel/qpointer.cpp
@@ -123,7 +123,7 @@
 /*!
     \fn QPointer::QPointer(T* p)
 
-    Constructs a guarded pointer that points to same object that \a p
+    Constructs a guarded pointer that points to the same object that \a p
     points to.
 */
 
@@ -273,3 +273,11 @@
     \a p2 are not pointing to the same object, otherwise
     returns false.
 */
+/*!
+    \fn QPointer<T> qPointerFromVariant(const QVariant &variant)
+
+    \internal
+
+    Returns a guarded pointer that points to the same object that
+    \a variant holds.
+*/