7 files changed, 26 insertions, 22 deletions
diff --git a/src/corelib/animation/qvariantanimation.cpp b/src/corelib/animation/qvariantanimation.cpp
index a783bcc31e..7117092c54 100644
--- a/src/corelib/animation/qvariantanimation.cpp
+++ b/src/corelib/animation/qvariantanimation.cpp
@@ -54,15 +54,13 @@ QT_BEGIN_NAMESPACE
     \class QVariantAnimation
     \inmodule QtCore
     \ingroup animation
-    \brief The QVariantAnimation class provides an abstract base class for animations.
+    \brief The QVariantAnimation class provides a base class for animations.
     \since 4.6
 
     This class is part of \l{The Animation Framework}. It serves as a
     base class for property and item animations, with functions for
     shared functionality.
 
-    QVariantAnimation cannot be used directly as it is an abstract
-    class; it has a pure virtual method called updateCurrentValue().
     The class performs interpolation over
     \l{QVariant}s, but leaves using the interpolated values to its
     subclasses. Currently, Qt provides QPropertyAnimation, which
@@ -75,7 +73,7 @@ QT_BEGIN_NAMESPACE
     start the animation. QVariantAnimation will interpolate the
     property of the target object and emit valueChanged(). To react to
     a change in the current value you have to reimplement the
-    updateCurrentValue() virtual function.
+    updateCurrentValue() virtual function or connect to said signal.
 
     It is also possible to set values at specified steps situated
     between the start and end value. The interpolation will then
diff --git a/src/corelib/doc/src/animation.qdoc b/src/corelib/doc/src/animation.qdoc
index 02eb5a97c6..4e71ed4268 100644
--- a/src/corelib/doc/src/animation.qdoc
+++ b/src/corelib/doc/src/animation.qdoc
@@ -118,11 +118,12 @@
 
     \section1 Animating Qt Properties
 
-    As mentioned in the previous section, the QPropertyAnimation class
-    can interpolate over Qt properties. It is this class that should
-    be used for animation of values; in fact, its superclass,
-    QVariantAnimation, is an abstract class, and cannot be used
-    directly.
+    As mentioned in the previous section, the QPropertyAnimation class can
+    interpolate over Qt properties. It is often this class that should be used
+    for animation of values; in fact, its superclass, QVariantAnimation, has an
+    empty implementation of \l{QAbstractAnimation::}{updateCurrentValue()}, and
+    does not change any value unless we change it ourselves on the
+    \l{QVariantAnimation::valueChanged()}{valueChanged signal}.
 
     A major reason we chose to animate Qt properties is that it
     presents us with freedom to animate already existing classes in
diff --git a/src/corelib/io/qdebug.cpp b/src/corelib/io/qdebug.cpp
index 0d9fdb3453..fa919e9f10 100644
--- a/src/corelib/io/qdebug.cpp
+++ b/src/corelib/io/qdebug.cpp
@@ -166,16 +166,15 @@ void QDebug::putUcs4(uint ucs4)
 {
     maybeQuote('\'');
     if (ucs4 < 0x20) {
-        stream->ts << hex << "\\x" << ucs4 << reset;
+        stream->ts << "\\x" << hex << ucs4 << reset;
     } else if (ucs4 < 0x80) {
         stream->ts << char(ucs4);
     } else {
-        stream->ts << hex << qSetPadChar(QLatin1Char('0'));
         if (ucs4 < 0x10000)
-            stream->ts << qSetFieldWidth(4) << "\\u";
+            stream->ts << "\\u" << qSetFieldWidth(4);
         else
-            stream->ts << qSetFieldWidth(8) << "\\U";
-        stream->ts << ucs4 << reset;
+            stream->ts << "\\U" << qSetFieldWidth(8);
+        stream->ts << hex << qSetPadChar(QLatin1Char('0')) << ucs4 << reset;
     }
     maybeQuote('\'');
 }
diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp
index 76b56f4699..6366c5120c 100644
--- a/src/corelib/io/qfileinfo.cpp
+++ b/src/corelib/io/qfileinfo.cpp
@@ -820,7 +820,7 @@ QString QFileInfo::completeBaseName() const
 }
 
 /*!
-    Returns the complete suffix of the file.
+    Returns the complete suffix (extension) of the file.
 
     The complete suffix consists of all characters in the file after
     (but not including) the first '.'.
@@ -839,7 +839,7 @@ QString QFileInfo::completeSuffix() const
 }
 
 /*!
-    Returns the suffix of the file.
+    Returns the suffix (extension) of the file.
 
     The suffix consists of all characters in the file after (but not
     including) the last '.'.
diff --git a/src/corelib/json/qjson_p.h b/src/corelib/json/qjson_p.h
index f92a6821d7..b0a634cb4a 100644
--- a/src/corelib/json/qjson_p.h
+++ b/src/corelib/json/qjson_p.h
@@ -684,6 +684,8 @@ public:
     bool operator >=(const Entry &other) const;
 };
 
+inline bool operator!=(const Entry &lhs, const Entry &rhs) { return !(lhs == rhs); }
+
 inline bool Entry::operator >=(const QString &key) const
 {
     if (value.latinKey)
diff --git a/src/corelib/json/qjsonobject.cpp b/src/corelib/json/qjsonobject.cpp
index b5b6f36bc6..fb651f0f24 100644
--- a/src/corelib/json/qjsonobject.cpp
+++ b/src/corelib/json/qjsonobject.cpp
@@ -599,8 +599,8 @@ bool QJsonObject::operator==(const QJsonObject &other) const
 
     for (uint i = 0; i < o->length; ++i) {
         QJsonPrivate::Entry *e = o->entryAt(i);
-        QJsonValue v(d, o, e->value);
-        if (other.value(e->key()) != v)
+        QJsonPrivate::Entry *oe = other.o->entryAt(i);
+        if (*e != *oe || QJsonValue(d, o, e->value) != QJsonValue(other.d, other.o, oe->value))
             return false;
     }
 
diff --git a/src/corelib/xml/qxmlstream.cpp b/src/corelib/xml/qxmlstream.cpp
index df5f3711cc..3949d2c3ac 100644
--- a/src/corelib/xml/qxmlstream.cpp
+++ b/src/corelib/xml/qxmlstream.cpp
@@ -3025,10 +3025,14 @@ void QXmlStreamWriterPrivate::checkIfASCIICompatibleCodec()
 {
 #ifndef QT_NO_TEXTCODEC
     Q_ASSERT(encoder);
-    // assumes ASCII-compatibility for all 8-bit encodings
-    QChar space = QLatin1Char(' ');
-    const QByteArray bytes = encoder->fromUnicode(&space, 1);
-    isCodecASCIICompatible = (bytes.count() == 1);
+    // test ASCII-compatibility using the letter 'a'
+    QChar letterA = QLatin1Char('a');
+    const QByteArray bytesA = encoder->fromUnicode(&letterA, 1);
+    const bool isCodecASCIICompatibleA = (bytesA.count() == 1) && (bytesA[0] == 0x61) ;
+    QChar letterLess = QLatin1Char('<');
+    const QByteArray bytesLess = encoder->fromUnicode(&letterLess, 1);
+    const bool isCodecASCIICompatibleLess = (bytesLess.count() == 1) && (bytesLess[0] == 0x3C) ;
+    isCodecASCIICompatible = isCodecASCIICompatibleA && isCodecASCIICompatibleLess ;
 #else
     isCodecASCIICompatible = true;
 #endif