1 files changed, 27 insertions, 54 deletions

diff --git a/src/qml/qml/qqmlcomponentattached_p.h b/src/qml/qml/qqmlcomponentattached_p.h
index 8ecd9da17d..303fea7b46 100644
--- a/src/qml/qml/qqmlcomponentattached_p.h
+++ b/src/qml/qml/qqmlcomponentattached_p.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** 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$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #ifndef QQMLCOMPONENTATTACHED_P_H
 #define QQMLCOMPONENTATTACHED_P_H
@@ -52,44 +16,53 @@
 //
 
 #include <QtQml/qqml.h>
+#include <QtQml/qqmlcomponent.h>
 #include <private/qtqmlglobal_p.h>
 #include <QtCore/QObject>
 
 QT_BEGIN_NAMESPACE
 
 
-class Q_QML_PRIVATE_EXPORT QQmlComponentAttached : public QObject
+// implemented in qqmlcomponent.cpp
+class Q_QML_EXPORT QQmlComponentAttached : public QObject
 {
     Q_OBJECT
-
-    // Used as attached object for QQmlComponent. We want qqmlcomponentattached_p.h to be #include'd
-    // when registering QQmlComponent, but we cannot #include it from qqmlcomponent.h. Therefore we
-    // force an anonymous type registration here.
-    QML_ANONYMOUS
 public:
     QQmlComponentAttached(QObject *parent = nullptr);
     ~QQmlComponentAttached();
 
-    void add(QQmlComponentAttached **a) {
-        prev = a; next = *a; *a = this;
-        if (next) next->prev = &next;
+    void insertIntoList(QQmlComponentAttached **listHead)
+    {
+        m_prev = listHead;
+        m_next = *listHead;
+        *listHead = this;
+        if (m_next)
+            m_next->m_prev = &m_next;
     }
-    void rem() {
-        if (next) next->prev = prev;
-        *prev = next;
-        next = nullptr; prev = nullptr;
+
+    void removeFromList()
+    {
+        *m_prev = m_next;
+        if (m_next)
+            m_next->m_prev = m_prev;
+        m_next = nullptr;
+        m_prev = nullptr;
     }
-    QQmlComponentAttached **prev;
-    QQmlComponentAttached *next;
+
+    QQmlComponentAttached *next() const { return m_next; }
 
 Q_SIGNALS:
     void completed();
     void destruction();
 
 private:
-    friend class QQmlContextData;
+    QQmlComponentAttached **m_prev;
+    QQmlComponentAttached *m_next;
 };
 
 QT_END_NAMESPACE
 
+// TODO: We still need this because we cannot properly use QML_ATTACHED with QML_FOREIGN.
+QML_DECLARE_TYPEINFO(QQmlComponent, QML_HAS_ATTACHED_PROPERTIES)
+
 #endif // QQMLCOMPONENTATTACHED_P_H