Merge remote-tracking branch 'origin/5.4' into 5.5

Conflicts:
	examples/xml/htmlinfo/simpleexample.html
	examples/xml/rsslisting/rsslisting.cpp
	qmake/generators/win32/msbuild_objectmodel.cpp
	src/3rdparty/harfbuzz-ng/src/hb-private.hh
	src/corelib/global/qlogging.cpp
	src/corelib/io/qstorageinfo_unix.cpp
	src/corelib/thread/qwaitcondition_unix.cpp
	src/gui/kernel/qguiapplication.cpp
	src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
	src/testlib/doc/src/qt-webpages.qdoc
	tests/auto/other/qaccessibility/tst_qaccessibility.cpp

Change-Id: Ib272ff0bc30a1a5d51275eb3cd2f201dc82c11ff

1 files changed, 16 insertions, 2 deletions

diff --git a/src/corelib/json/qjsonvalue.cpp b/src/corelib/json/qjsonvalue.cpp
index 306cc1d15b..4845d8c876 100644
--- a/src/corelib/json/qjsonvalue.cpp
+++ b/src/corelib/json/qjsonvalue.cpp
@@ -74,6 +74,20 @@ QT_BEGIN_NAMESPACE
     conversions. This implies that converting to a type that is not stored in the value will return a default
     constructed return value.
 
+    \section1 QJsonValueRef
+
+    QJsonValueRef is a helper class for QJsonArray and QJsonObject.
+    When you get an object of type QJsonValueRef, you can
+    use it as if it were a reference to a QJsonValue. If you assign to it,
+    the assignment will apply to the element in the QJsonArray or QJsonObject
+    from which you got the reference.
+
+    The following methods return QJsonValueRef:
+    \list
+    \li \l {QJsonArray}::operator[](int i)
+    \li \l {QJsonObject}::operator[](const QString & key) const
+    \endlist
+
     \sa {JSON Support in Qt}, {JSON Save Game Example}
 */
 
@@ -419,13 +433,13 @@ QJsonValue QJsonValue::fromVariant(const QVariant &variant)
 
     The QJsonValue types will be converted as follows:
 
-    \value Null     {QVariant::}{QVariant()}
+    \value Null     \l {QVariant::}{QVariant()}
     \value Bool     QMetaType::Bool
     \value Double   QMetaType::Double
     \value String   QString
     \value Array    QVariantList
     \value Object   QVariantMap
-    \value Undefined {QVariant::}{QVariant()}
+    \value Undefined \l {QVariant::}{QVariant()}
 
     \sa fromVariant()
  */