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

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  tst_qnetworkreply benchmark: Properly finish the thread
  QSslSocket: Remove writeBuffer,readBuffer and use from QAbstractSocket
  doc: This bug wasn't really a bug; it just required clarification.
  Update my changelog for 4.6.1
  My changes for 4.6.1
  Remove erroneous warning in QFileInfo::absolutePath()
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 8b9165d3bc84d1c8cc7df49a191cc3857b5530d4 )

2 files changed, 12 insertions, 9 deletions

diff --git a/doc/src/objectmodel/properties.qdoc b/doc/src/objectmodel/properties.qdoc
index 076c544..a807caf 100644
--- a/doc/src/objectmodel/properties.qdoc
+++ b/doc/src/objectmodel/properties.qdoc
@@ -208,17 +208,20 @@
     the property type. The meta-object compiler enforces these
     requirements.
 
-    Given a pointer to an instance of MyClass or a pointer to an
-    instance of QObject that happens to be an instance of MyClass, we
-    have two ways to set its priority property.
+    Given a pointer to an instance of MyClass or a pointer to a
+    QObject that is an instance of MyClass, we have two ways to set
+    its priority property:
 
     \snippet doc/src/snippets/code/doc_src_properties.qdoc 6
 
-    In the example, the enumeration type used for the property type
-    was locally declared in MyClass. Had it been declared in another
-    class, its fully qualified name (i.e., OtherClass::Priority) would
-    be required.  In addition, that other class must also inherit
-    QObject and register the enum type using Q_ENUMS().
+    In the example, the enumeration type that is the property type is
+    declared in MyClass and registered with the \l{Meta-Object System}
+    using the Q_ENUMS() macro. This makes the enumeration values
+    available as strings for use as in the call to setProperty(). Had
+    the enumeration type been declared in another class, its fully
+    qualified name (i.e., OtherClass::Priority) would be required, and
+    that other class would also have to inherit QObject and register
+    the enumeration type there using the Q_ENUMS() macro.
 
     A similar macro, Q_FLAGS(), is also available. Like Q_ENUMS(), it
     registers an enumeration type, but it marks the type as being a
diff --git a/doc/src/snippets/code/doc_src_properties.qdoc b/doc/src/snippets/code/doc_src_properties.qdoc
index 38cc139..962d930 100644
--- a/doc/src/snippets/code/doc_src_properties.qdoc
+++ b/doc/src/snippets/code/doc_src_properties.qdoc
@@ -112,7 +112,7 @@ MyClass *myinstance = new MyClass;
 QObject *object = myinstance;
 
 myinstance->setPriority(MyClass::VeryHigh);
-object->setProperty("priority", (int)MyClass::VeryHigh);
+object->setProperty("priority", "VeryHigh");
 //! [6]