summaryrefslogtreecommitdiffstats
path: root/src/corelib/json
diff options
context:
space:
mode:
authorNico Vertriest <nico.vertriest@digia.com>2014-08-21 12:05:49 +0200
committerNico Vertriest <nico.vertriest@digia.com>2014-08-25 14:43:36 +0200
commit9286fdf4a06f25fc6fa743346c6beef7438170cb (patch)
treee49ec5f51ca5176cde3a6574f69307c6dc939e72 /src/corelib/json
parent7f1051ed62ad3bc39c064af001e89ebdccc26a7e (diff)
Doc: corrected autolink errors Qjsonvalue
Task-number: QTBUG-40362 Change-Id: I2ae782ea606e8ee55ee0fcfbbb29db3216b0574b Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Diffstat (limited to 'src/corelib/json')
-rw-r--r--src/corelib/json/qjsonvalue.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/json/qjsonvalue.cpp b/src/corelib/json/qjsonvalue.cpp
index 4c4838d314..4838a78217 100644
--- a/src/corelib/json/qjsonvalue.cpp
+++ b/src/corelib/json/qjsonvalue.cpp
@@ -420,17 +420,17 @@ QJsonValue QJsonValue::fromVariant(const QVariant &variant)
}
/*!
- Converts the value to a QVariant.
+ Converts the value to a \l {QVariant::}{QVariant()}.
The QJsonValue types will be converted as follows:
- \value Null QVariant()
+ \value Null {QVariant::}{QVariant()}
\value Bool QMetaType::Bool
\value Double QMetaType::Double
\value String QString
\value Array QVariantList
\value Object QVariantMap
- \value Undefined QVariant()
+ \value Undefined {QVariant::}{QVariant()}
\sa fromVariant()
*/
@@ -553,7 +553,7 @@ QJsonArray QJsonValue::toArray(const QJsonArray &defaultValue) const
Converts the value to an array and returns it.
- If type() is not Array, a QJsonArray() will be returned.
+ If type() is not Array, a \l{QJsonArray::}{QJsonArray()} will be returned.
*/
QJsonArray QJsonValue::toArray() const
{
@@ -578,8 +578,8 @@ QJsonObject QJsonValue::toObject(const QJsonObject &defaultValue) const
Converts the value to an object and returns it.
- If type() is not Object, the QJsonObject() will be returned.
- */
+ If type() is not Object, the \l {QJsonObject::}{QJsonObject()} will be returned.
+*/
QJsonObject QJsonValue::toObject() const
{
return toObject(QJsonObject());