4 files changed, 3 insertions, 123 deletions
diff --git a/src/qml/doc/src/qmlfunctions.qdoc b/src/qml/doc/src/qmlfunctions.qdoc
index 6f738752a7..26fc40ff37 100644
--- a/src/qml/doc/src/qmlfunctions.qdoc
+++ b/src/qml/doc/src/qmlfunctions.qdoc
@@ -338,9 +338,8 @@
    One exception to this is that a QObject singleton type property may not be aliased (because the
    singleton type name does not identify an object within the same component as any other item).
 
-   \b{NOTE:} A QObject singleton type instance returned from a singleton type provider is owned by the QML
-   engine.  For this reason, the singleton type provider function should \b{not} be implemented as a
-   singleton factory.
+   \b{NOTE:} A QObject singleton type instance returned from a singleton type provider is owned by
+   the QML engine unless the object has explicit QQmlEngine::CppOwnership flag set.
 
    Usage:
    \code
diff --git a/src/qml/qml/ftw/ftw.pri b/src/qml/qml/ftw/ftw.pri
index 51697b0aff..a671cfa12d 100644
--- a/src/qml/qml/ftw/ftw.pri
+++ b/src/qml/qml/ftw/ftw.pri
@@ -5,7 +5,6 @@ HEADERS +=  \
     $$PWD/qhashedstring_p.h \
     $$PWD/qqmlrefcount_p.h \
     $$PWD/qfieldlist_p.h \
-    $$PWD/qhashfield_p.h \
     $$PWD/qqmlthread_p.h \
     $$PWD/qfinitestack_p.h \
     $$PWD/qrecursionwatcher_p.h \
diff --git a/src/qml/qml/ftw/qhashfield_p.h b/src/qml/qml/ftw/qhashfield_p.h
deleted file mode 100644
index 15114239eb..0000000000
--- a/src/qml/qml/ftw/qhashfield_p.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QHASHFIELD_P_H
-#define QHASHFIELD_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-
-#include <QtCore/qglobal.h>
-
-QT_BEGIN_NAMESPACE
-
-// QHashField can be used for doing coarse grained set testing, in
-// cases where you do not expect the set to contain the item.  For
-// example where you would write:
-//     QSet<QString> strings;
-//     for (int ii = 0; ii < mystrings.count(); ++ii) {
-//         if (strings.contains(mystrings.at(ii)))
-//             qFatal("Duplication!");
-//         strings.insert(mystrings);
-//     }
-// You may write:
-//     QHashField strings;
-//     for (int ii = 0; ii < mystrings.count(); ++ii) {
-//         if (strings.testAndSet(qHash(mystrings.at(ii)))) {
-//             // The string *might* be duplicated
-//             for (int jj = 0; jj < ii; ++jj) {
-//                 if (mystrings.at(ii) == mystrings.at(jj))
-//                     qFatal("Duplication!");
-//             }
-//          }
-//     }
-// For small lists of things, where the hash is cheap to calculate
-// and you don't expect duplication this will be much faster.
-class QHashField {
-public:
-    inline QHashField();
-
-    inline void clear();
-
-    inline bool test(quint32 hash);
-    inline bool testAndSet(quint32 hash);
-private:
-    quint32 m_field;
-};
-
-QHashField::QHashField()
-: m_field(0)
-{
-}
-
-void QHashField::clear()
-{
-    m_field = 0;
-}
-
-bool QHashField::test(quint32 hash)
-{
-    return m_field & (1 << (hash % 31));
-}
-
-bool QHashField::testAndSet(quint32 hash)
-{
-    quint32 mask = 1 << (hash % 31);
-    bool rv = m_field & mask;
-    m_field |= mask;
-    return rv;
-}
-
-QT_END_NAMESPACE
-
-#endif // QHASHFIELD_P_H
diff --git a/src/qml/qml/qqmlincubator.cpp b/src/qml/qml/qqmlincubator.cpp
index a046bfd922..235aa1bf44 100644
--- a/src/qml/qml/qqmlincubator.cpp
+++ b/src/qml/qml/qqmlincubator.cpp
@@ -687,7 +687,7 @@ void QQmlIncubator::statusChanged(Status status)
 Called after the \a object is first created, but before property bindings are
 evaluated and, if applicable, QQmlParserStatus::componentComplete() is
 called.  This is equivalent to the point between QQmlComponent::beginCreate()
-and QQmlComponent::endCreate(), and can be used to assign initial values
+and QQmlComponent::completeCreate(), and can be used to assign initial values
 to the object's properties.
 
 The default implementation does nothing.