7 files changed, 36 insertions, 23 deletions
diff --git a/src/qml/common/qv4compileddata_p.h b/src/qml/common/qv4compileddata_p.h
index a5a1cf8969..be0ca3f477 100644
--- a/src/qml/common/qv4compileddata_p.h
+++ b/src/qml/common/qv4compileddata_p.h
@@ -1330,7 +1330,8 @@ public:
     template<typename Char>
     bool saveToDisk(const std::function<bool(const Char *, quint32)> &writer) const
     {
-        auto cleanup = qScopeGuard([this]() { mutableFlags() ^= temporaryFlags; });
+        const quint32_le oldFlags = mutableFlags();
+        auto cleanup = qScopeGuard([this, oldFlags]() { mutableFlags() = oldFlags; });
         mutableFlags() |= temporaryFlags;
         return writer(data<Char>(), size());
     }
diff --git a/src/qml/doc/snippets/qml/integrating-javascript/includejs/script.mjs b/src/qml/doc/snippets/qml/integrating-javascript/includejs/script.mjs
index 86c3e078c8..1326b8c87a 100644
--- a/src/qml/doc/snippets/qml/integrating-javascript/includejs/script.mjs
+++ b/src/qml/doc/snippets/qml/integrating-javascript/includejs/script.mjs
@@ -50,8 +50,9 @@
 //![0]
 // script.mjs
 import { factorial } from "factorial.mjs"
+export { factorial }
 
-function showCalculations(value) {
+export function showCalculations(value) {
     console.log(
         "Call factorial() from script.js:",
         factorial(value));
diff --git a/src/qml/doc/src/javascript/imports.qdoc b/src/qml/doc/src/javascript/imports.qdoc
index 9227f0e604..8d49c02f62 100644
--- a/src/qml/doc/src/javascript/imports.qdoc
+++ b/src/qml/doc/src/javascript/imports.qdoc
@@ -95,17 +95,18 @@ or modules).
 
 A JavaScript resource may import another in the following fashion:
 \code
-.import "filename.js" as Qualifier
+import * as MathFunctions from "factorial.mjs";
 \endcode
-For example:
+Or:
 \code
-import * as MathFunctions from "factorial.mjs";
+.import "filename.js" as Qualifier
 \endcode
 
-The latter is standard ECMAScript syntax for importing ECMAScript modules, and
+The former is standard ECMAScript syntax for importing ECMAScript modules, and
 only works from within ECMAScript modules as denoted by the \c mjs file
-extension. The former is an extension to JavaScript provided by the \c QML
-engine and will work also with non-modules.
+extension. The latter is an extension to JavaScript provided by the \c QML
+engine and will work also with non-modules. As an extension superseded by the
+ECMAScript standard, its usage is discouraged.
 
 When a JavaScript file is imported this way, it is imported with a qualifier.
 The functions in that file are then accessible from the importing script via the
diff --git a/src/qml/qml/qqmlcontext.cpp b/src/qml/qml/qqmlcontext.cpp
index 305c610a8f..f293ff8e9c 100644
--- a/src/qml/qml/qqmlcontext.cpp
+++ b/src/qml/qml/qqmlcontext.cpp
@@ -82,11 +82,11 @@ QQmlContextPrivate::QQmlContextPrivate()
     context->setContextProperty("myModel", &modelData);
 
     QQmlComponent component(&engine);
-    component.setData("import QtQuick 2.0\nListView { model: myModel }", QUrl());
+    component.setData("import QtQuick 2.0; ListView { model: myModel }", QUrl());
     QObject *window = component.create(context);
     \endcode
 
-    Note it is the responsibility of the creator to delete any QQmlContext it
+    \note It is the responsibility of the creator to delete any QQmlContext it
     constructs. If the \c context object in the example is no longer needed when the
     \c window component instance is destroyed, the \c context must be destroyed explicitly.
     The simplest way to ensure this is to set \c window as the parent of \c context.
@@ -102,10 +102,10 @@ QQmlContextPrivate::QQmlContextPrivate()
     object.
 
     \code
-    class MyDataSet : ... {
-        ...
+    class MyDataSet : public QObject {
+        // ...
         Q_PROPERTY(QAbstractItemModel *myModel READ model NOTIFY modelChanged)
-        ...
+        // ...
     };
 
     MyDataSet myDataSet;
@@ -114,7 +114,7 @@ QQmlContextPrivate::QQmlContextPrivate()
     context->setContextObject(&myDataSet);
 
     QQmlComponent component(&engine);
-    component.setData("import QtQuick 2.0\nListView { model: myModel }", QUrl());
+    component.setData("import QtQuick 2.0; ListView { model: myModel }", QUrl());
     component.create(context);
     \endcode
 
@@ -138,10 +138,10 @@ QQmlContextPrivate::QQmlContextPrivate()
     QQmlContext *context1 = new QQmlContext(engine.rootContext());
     QQmlContext *context2 = new QQmlContext(context1);
 
-    context1->setContextProperty("a", 12);
-    context1->setContextProperty("b", 12);
+    context1->setContextProperty("a", 9001);
+    context1->setContextProperty("b", 9001);
 
-    context2->setContextProperty("b", 15);
+    context2->setContextProperty("b", 42);
     \endcode
 
     While QML objects instantiated in a context are not strictly owned by that
@@ -235,7 +235,7 @@ bool QQmlContext::isValid() const
 }
 
 /*!
-    Return the context's QQmlEngine, or 0 if the context has no QQmlEngine or the
+    Return the context's QQmlEngine, or \nullptr if the context has no QQmlEngine or the
     QQmlEngine was destroyed.
 */
 QQmlEngine *QQmlContext::engine() const
@@ -245,7 +245,7 @@ QQmlEngine *QQmlContext::engine() const
 }
 
 /*!
-    Return the context's parent QQmlContext, or 0 if this context has no
+    Return the context's parent QQmlContext, or \nullptr if this context has no
     parent or if the parent has been destroyed.
 */
 QQmlContext *QQmlContext::parentContext() const
@@ -255,7 +255,7 @@ QQmlContext *QQmlContext::parentContext() const
 }
 
 /*!
-    Return the context object, or 0 if there is no context object.
+    Return the context object, or \nullptr if there is no context object.
 */
 QObject *QQmlContext::contextObject() const
 {
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index 54cc07af2e..dcc2f8f7f5 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -1063,6 +1063,16 @@ QQmlEngine::~QQmlEngine()
   Once the component cache has been cleared, components must be loaded before
   any new objects can be created.
 
+  \note Any existing objects created from QML components retain their types,
+  even if you clear the component cache. This includes singleton objects. If you
+  create more objects from the same QML code after clearing the cache, the new
+  objects will be of different types than the old ones. Assigning such a new
+  object to a property of its declared type belonging to an object created
+  before clearing the cache won't work.
+
+  As a general rule of thumb, make sure that no objects created from QML
+  components are alive when you clear the component cache.
+
   \sa trimComponentCache()
  */
 void QQmlEngine::clearComponentCache()
diff --git a/src/qml/qml/qqmlexpression.cpp b/src/qml/qml/qqmlexpression.cpp
index f6a5afb891..e9f8bce942 100644
--- a/src/qml/qml/qqmlexpression.cpp
+++ b/src/qml/qml/qqmlexpression.cpp
@@ -204,7 +204,7 @@ QQmlExpression::~QQmlExpression()
 }
 
 /*!
-    Returns the QQmlEngine this expression is associated with, or 0 if there
+    Returns the QQmlEngine this expression is associated with, or \nullptr if there
     is no association or the QQmlEngine has been destroyed.
 */
 QQmlEngine *QQmlExpression::engine() const
@@ -214,7 +214,7 @@ QQmlEngine *QQmlExpression::engine() const
 }
 
 /*!
-    Returns the QQmlContext this expression is associated with, or 0 if there
+    Returns the QQmlContext this expression is associated with, or \nullptr if there
     is no association or the QQmlContext has been destroyed.
 */
 QQmlContext *QQmlExpression::context() const
diff --git a/src/qml/qml/qqmlfileselector.cpp b/src/qml/qml/qqmlfileselector.cpp
index 32dce8b4bc..c386f2727b 100644
--- a/src/qml/qml/qqmlfileselector.cpp
+++ b/src/qml/qml/qqmlfileselector.cpp
@@ -148,7 +148,7 @@ QQmlFileSelectorPrivate::~QQmlFileSelectorPrivate()
 /*!
   Sets the QFileSelector instance for use by the QQmlFileSelector to \a selector.
   QQmlFileSelector does not take ownership of the new QFileSelector. To reset QQmlFileSelector
-  to use its internal QFileSelector instance, call setSelector(0).
+  to use its internal QFileSelector instance, call setSelector(\nullptr).
 */
 
 void QQmlFileSelector::setSelector(QFileSelector *selector)