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

Change-Id: Ibc7a47f7ce6d15dff79fdc59f8ded297d1b8d50d

5 files changed, 27 insertions, 4 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()
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/qml/qml/qqmlvaluetype.cpp b/src/qml/qml/qqmlvaluetype.cpp
index 6a71a07e9b..53b1ffccb5 100644
--- a/src/qml/qml/qqmlvaluetype.cpp
+++ b/src/qml/qml/qqmlvaluetype.cpp
@@ -82,7 +82,8 @@ bool QQmlValueTypeFactoryImpl::isValueType(int idx)
             && idx != QVariant::StringList
             && idx != QMetaType::QObjectStar
             && idx != QMetaType::VoidStar
-            && idx != QMetaType::QVariant) {
+            && idx != QMetaType::QVariant
+            && idx != QMetaType::QLocale) {
         return true;
     }
 
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
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index 0a09ee42de..e44ba2116e 100644
--- a/src/quick/items/context2d/qquickcontext2d.cpp
+++ b/src/quick/items/context2d/qquickcontext2d.cpp
@@ -189,7 +189,7 @@ QColor qt_color_from_string(const QV4::Value &name)
         if (isRgb)
             return QColor::fromRgba(qRgba(qClamp(rh, 0, 255), qClamp(gs, 0, 255), qClamp(bl, 0, 255), qClamp(alpha, 0, 255)));
         else if (isHsl)
-            return QColor::fromHsl(qClamp(rh, 0, 255), qClamp(gs, 0, 255), qClamp(bl, 0, 255), qClamp(alpha, 0, 255));
+            return QColor::fromHsl(qClamp(rh, 0, 359), qClamp(gs, 0, 255), qClamp(bl, 0, 255), qClamp(alpha, 0, 255));
     }
     return QColor();
 }