diff options
| author | Martin Smith <martin.smith@qt.io> | 2018-02-05 11:21:32 +0100 |
|---|---|---|
| committer | Martin Smith <martin.smith@qt.io> | 2018-02-09 17:12:12 +0000 |
| commit | 47cd9da96371ccd495f6caabe1c6853258210ebb (patch) | |
| tree | 13d01990443b72fbb7d0e7ee5f8493aa25802cee /src/qml/jsapi | |
| parent | 11fca802e342d2331391fd314018cb7ee208dfb7 (diff) | |
doc: Fix qdoc warnings for templates and statics
Several \fn commands needed template parameters added, and several
static functions that were not accessible were documented but should
not have been documented. The template texts were added and the qdoc
comments of the static functions were changed to non-qdoc comments.
Change-Id: Icc44e243fbec2023865f47b7c73dc15d241d5b4d
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Diffstat (limited to 'src/qml/jsapi')
| -rw-r--r-- | src/qml/jsapi/qjsengine.cpp | 6 | ||||
| -rw-r--r-- | src/qml/jsapi/qjsvalue.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/jsapi/qjsengine.cpp b/src/qml/jsapi/qjsengine.cpp index 020a83f837..d83d9c7927 100644 --- a/src/qml/jsapi/qjsengine.cpp +++ b/src/qml/jsapi/qjsengine.cpp @@ -552,7 +552,7 @@ QJSValue QJSEngine::newQMetaObject(const QMetaObject* metaObject) { return QJSValue(v4, v->asReturnedValue()); } -/*! \fn QJSValue QJSEngine::newQMetaObject<T>() +/*! \fn template <typename T> QJSValue QJSEngine::newQMetaObject() \since 5.8 Creates a JavaScript object that wraps the static QMetaObject associated @@ -710,14 +710,14 @@ bool QJSEngine::convertV2(const QJSValue &value, int type, void *ptr) } } -/*! \fn QJSValue QJSEngine::toScriptValue(const T &value) +/*! \fn template <typename T> QJSValue QJSEngine::toScriptValue(const T &value) Creates a QJSValue with the given \a value. \sa fromScriptValue() */ -/*! \fn T QJSEngine::fromScriptValue(const QJSValue &value) +/*! \fn template <typename T> T QJSEngine::fromScriptValue(const QJSValue &value) Returns the given \a value converted to the template type \c{T}. diff --git a/src/qml/jsapi/qjsvalue.cpp b/src/qml/jsapi/qjsvalue.cpp index c1a135c835..adfa98bd46 100644 --- a/src/qml/jsapi/qjsvalue.cpp +++ b/src/qml/jsapi/qjsvalue.cpp @@ -232,7 +232,7 @@ QJSValue::QJSValue(const QJSValue& other) */ /*! - \fn QJSValue &operator=(QJSValue && other) + \fn QJSValue &QJSValue::operator=(QJSValue && other) Move-assigns \a other to this QJSValue object. */ |