diff options
-rw-r--r-- | src/qml/jsapi/qjsvalue.cpp | 12 | ||||
-rw-r--r-- | src/qml/qml/qqmlabstracturlinterceptor.cpp | 10 | ||||
-rw-r--r-- | src/quick/doc/src/dynamicview-tutorial.qdoc | 4 |
3 files changed, 24 insertions, 2 deletions
diff --git a/src/qml/jsapi/qjsvalue.cpp b/src/qml/jsapi/qjsvalue.cpp index 50669c46a8..1d9dc2b6db 100644 --- a/src/qml/jsapi/qjsvalue.cpp +++ b/src/qml/jsapi/qjsvalue.cpp @@ -212,6 +212,18 @@ QJSValue::QJSValue(const QJSValue& other) } /*! + \fn QJSValue::QJSValue(QJSValue && other) + + Move constructor. Moves from \a other into this QJSValue object. +*/ + +/*! + \fn QJSValue &operator=(QJSValue && other) + + Move-assigns \a other to this QJSValue object. +*/ + +/*! Destroys this QJSValue. */ QJSValue::~QJSValue() diff --git a/src/qml/qml/qqmlabstracturlinterceptor.cpp b/src/qml/qml/qqmlabstracturlinterceptor.cpp index cb57bc2146..dce41b0caa 100644 --- a/src/qml/qml/qqmlabstracturlinterceptor.cpp +++ b/src/qml/qml/qqmlabstracturlinterceptor.cpp @@ -82,3 +82,13 @@ Your implementation of this function must be thread-safe, as it can be called from multiple threads at the same time. */ +/*! + \fn QQmlAbstractUrlInterceptor::QQmlAbstractUrlInterceptor() + + Constructor for QQmlAbstractUrlInterceptor. +*/ +/*! + \fn QQmlAbstractUrlInterceptor::~QQmlAbstractUrlInterceptor() + + Destructor for QQmlAbstractUrlInterceptor. +*/ diff --git a/src/quick/doc/src/dynamicview-tutorial.qdoc b/src/quick/doc/src/dynamicview-tutorial.qdoc index f87f94f264..2b5bb6e0c1 100644 --- a/src/quick/doc/src/dynamicview-tutorial.qdoc +++ b/src/quick/doc/src/dynamicview-tutorial.qdoc @@ -208,8 +208,8 @@ item and then transfer the item to the items group before moving it to the pre-d repeat until the unsorted group is empty. To find the insert position for an item we request a handle for the item from the unsorted group -with the \l {DelegateModel::}{get} function. Through the model property on this -handle we can access the same model data that is available in a delegate instance of that item and +with the \l {DelegateModelGroup::}{get()} function. Through the model property on this handle we can +access the same model data that is available in a delegate instance of that item and compare against other items to determine relative position. \snippet tutorials/dynamicview/dynamicview4/dynamicview.qml 3 |