Merge remote-tracking branch 'origin/api_changes' into containters

Conflicts:
	src/corelib/kernel/qmetaobject.cpp
	src/corelib/kernel/qvariant.cpp
	src/tools/moc/moc.h

Change-Id: I2cd3d95b41d2636738c6b98064864941e3b0b4e6

6 files changed, 27 insertions, 23 deletions

diff --git a/src/corelib/json/qjson_p.h b/src/corelib/json/qjson_p.h
index 55c37988e2..0742ced39b 100644
--- a/src/corelib/json/qjson_p.h
+++ b/src/corelib/json/qjson_p.h
@@ -309,6 +309,7 @@ public:
     {
         d->length = str.length();
 #if Q_BYTE_ORDER == Q_BIG_ENDIAN
+        const qle_ushort *uc = (const qle_ushort *)str.unicode();
         for (int i = 0; i < str.length(); ++i)
             d->utf16[i] = uc[i];
 #else
@@ -359,7 +360,7 @@ public:
         QString str(l, Qt::Uninitialized);
         QChar *ch = str.data();
         for (int i = 0; i < l; ++i)
-            ch[i] = d->utf16[i];
+            ch[i] = QChar(d->utf16[i]);
         return str;
 #endif
     }
diff --git a/src/corelib/json/qjsonarray.cpp b/src/corelib/json/qjsonarray.cpp
index 0eb1974147..433a68105d 100644
--- a/src/corelib/json/qjsonarray.cpp
+++ b/src/corelib/json/qjsonarray.cpp
@@ -44,6 +44,7 @@
 #include <qjsonarray.h>
 #include <qjsonvalue.h>
 #include <qstringlist.h>
+#include <qvariant.h>
 #include <qdebug.h>
 
 #include "qjsonwriter_p.h"
@@ -559,7 +560,7 @@ bool QJsonArray::operator!=(const QJsonArray &other) const
 
 /*! \typedef QJsonArray::iterator::iterator_category
 
-  A synonym for \i {std::random_access_iterator_tag} indicating
+  A synonym for \e {std::random_access_iterator_tag} indicating
   this iterator is a random access iterator.
 */
 
@@ -793,7 +794,7 @@ bool QJsonArray::operator!=(const QJsonArray &other) const
 
 /*! \typedef QJsonArray::const_iterator::iterator_category
 
-  A synonym for \i {std::random_access_iterator_tag} indicating
+  A synonym for \e {std::random_access_iterator_tag} indicating
   this iterator is a random access iterator.
 */
 
diff --git a/src/corelib/json/qjsondocument.cpp b/src/corelib/json/qjsondocument.cpp
index 8a7fa760ae..c2204bf696 100644
--- a/src/corelib/json/qjsondocument.cpp
+++ b/src/corelib/json/qjsondocument.cpp
@@ -44,6 +44,7 @@
 #include <qjsonvalue.h>
 #include <qjsonarray.h>
 #include <qstringlist.h>
+#include <qvariant.h>
 #include <qdebug.h>
 #include "qjsonwriter_p.h"
 #include "qjsonparser_p.h"
diff --git a/src/corelib/json/qjsonobject.cpp b/src/corelib/json/qjsonobject.cpp
index b7af8c22cf..cfe71e8959 100644
--- a/src/corelib/json/qjsonobject.cpp
+++ b/src/corelib/json/qjsonobject.cpp
@@ -44,6 +44,7 @@
 #include <qjsonarray.h>
 #include <qstringlist.h>
 #include <qdebug.h>
+#include <qvariant.h>
 #include "qjson_p.h"
 #include "qjsonwriter_p.h"
 
@@ -568,7 +569,7 @@ QJsonObject::const_iterator QJsonObject::constFind(const QString &key) const
 
 /*! \typedef QJsonObject::iterator::iterator_category
 
-  A synonym for \i {std::bidirectional_iterator_tag} indicating
+  A synonym for \e {std::bidirectional_iterator_tag} indicating
   this iterator is a bidirectional iterator.
 */
 
@@ -757,7 +758,7 @@ QJsonObject::const_iterator QJsonObject::constFind(const QString &key) const
 
 /*! \typedef QJsonObject::const_iterator::iterator_category
 
-  A synonym for \i {std::bidirectional_iterator_tag} indicating
+  A synonym for \e {std::bidirectional_iterator_tag} indicating
   this iterator is a bidirectional iterator.
 */
 
diff --git a/src/corelib/json/qjsonparser.cpp b/src/corelib/json/qjsonparser.cpp
index 16eedadf1a..a83685da22 100644
--- a/src/corelib/json/qjsonparser.cpp
+++ b/src/corelib/json/qjsonparser.cpp
@@ -584,9 +584,9 @@ static inline bool addHexDigit(char digit, uint *result)
     if (digit >= '0' && digit <= '9')
         *result |= (digit - '0');
     else if (digit >= 'a' && digit <= 'f')
-        *result |= (digit - 'a');
+        *result |= (digit - 'a') + 10;
     else if (digit >= 'A' && digit <= 'F')
-            *result |= (digit - 'A');
+        *result |= (digit - 'A') + 10;
     else
         return false;
     return true;
diff --git a/src/corelib/json/qjsonvalue.cpp b/src/corelib/json/qjsonvalue.cpp
index ec63db79f5..2eedef67ce 100644
--- a/src/corelib/json/qjsonvalue.cpp
+++ b/src/corelib/json/qjsonvalue.cpp
@@ -64,12 +64,12 @@ QT_BEGIN_NAMESPACE
     JSON is a format to store structured data. It has 6 basic data types:
 
     \list
-    \o bool QJsonValue::Bool
-    \o double QJsonValue::Double
-    \o string QJsonValue::String
-    \o array QJsonValue::Array
-    \o object QJsonValue::Object
-    \o null QJsonValue::Null
+    \li bool QJsonValue::Bool
+    \li double QJsonValue::Double
+    \li string QJsonValue::String
+    \li array QJsonValue::Array
+    \li object QJsonValue::Object
+    \li null QJsonValue::Null
     \endlist
 
     A value can represent any of the above data types. In addition, QJsonValue has one special
@@ -260,16 +260,16 @@ QJsonValue &QJsonValue::operator =(const QJsonValue &other)
     The conversion will convert QVariant types as follows:
 
     \list
-    \o QVariant::Bool to Bool
-    \o QVariant::Int
-    \o QVariant::Double
-    \o QVariant::LongLong
-    \o QVariant::ULongLong
-    \o QVariant::UInt to Double
-    \o QVariant::String to String
-    \o QVariant::StringList
-    \o QVariant::VariantList to Array
-    \o QVariant::VariantMap to Object
+    \li QVariant::Bool to Bool
+    \li QVariant::Int
+    \li QVariant::Double
+    \li QVariant::LongLong
+    \li QVariant::ULongLong
+    \li QVariant::UInt to Double
+    \li QVariant::String to String
+    \li QVariant::StringList
+    \li QVariant::VariantList to Array
+    \li QVariant::VariantMap to Object
     \endlist
 
     For all other QVariant types a conversion to a QString will be attempted. If the returned string