diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-09-02 17:19:03 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-09-02 17:19:48 +0200 |
| commit | 149ece7a0cfb4fc90fe4544379ee2772fde881fd (patch) | |
| tree | 6a8a3ec11beb53eb06ccc69a0ec04a9d80053c0e /src/qml/jsapi/qjsvalue.cpp | |
| parent | 9ee31a6ae852eb347951e371958dd435409c9941 (diff) | |
| parent | d1b20513798ed441afddb87fd4e7facce78349e1 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: Ibc7a47f7ce6d15dff79fdc59f8ded297d1b8d50d
Diffstat (limited to 'src/qml/jsapi/qjsvalue.cpp')
| -rw-r--r-- | src/qml/jsapi/qjsvalue.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/qml/jsapi/qjsvalue.cpp b/src/qml/jsapi/qjsvalue.cpp index 6d0c7cfdda..a49b98c921 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() |