1 files changed, 17 insertions, 32 deletions

diff --git a/sources/shiboken6/ApiExtractor/propertyspec.h b/sources/shiboken6/ApiExtractor/propertyspec.h
index 4121f72d2..9e2e0f3d4 100644
--- a/sources/shiboken6/ApiExtractor/propertyspec.h
+++ b/sources/shiboken6/ApiExtractor/propertyspec.h
@@ -1,36 +1,14 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt for Python.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** 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 General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** 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-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2020 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #ifndef PROPERTYSPEC_H
 #define PROPERTYSPEC_H
 
 class AbstractMetaType;
 
+#include "abstractmetalang_typedefs.h"
+#include "typesystem_typedefs.h"
+
 #include <QtCore/QStringList>
 #include <QtCore/QSharedDataPointer>
 
@@ -39,6 +17,7 @@ class AbstractMetaType;
 class AbstractMetaClass;
 class AbstractMetaBuilderPrivate;
 class AbstractMetaType;
+class Documentation;
 class TypeEntry;
 
 struct TypeSystemProperty;
@@ -54,8 +33,8 @@ public:
                            const AbstractMetaType &type);
     QPropertySpec(const QPropertySpec &);
     QPropertySpec &operator=(const QPropertySpec &);
-    QPropertySpec(QPropertySpec &&);
-    QPropertySpec &operator=(QPropertySpec &&);
+    QPropertySpec(QPropertySpec &&) noexcept;
+    QPropertySpec &operator=(QPropertySpec &&) noexcept;
     ~QPropertySpec();
 
     static TypeSystemProperty typeSystemPropertyFromQ_Property(const QString &declarationIn,
@@ -64,14 +43,14 @@ public:
 
     static std::optional<QPropertySpec>
         fromTypeSystemProperty(AbstractMetaBuilderPrivate *b,
-                               AbstractMetaClass *metaClass,
+                               const AbstractMetaClassPtr &metaClass,
                                const TypeSystemProperty &ts,
                                const QStringList &scopes,
                                QString *errorMessage);
 
     static std::optional<QPropertySpec>
         parseQ_Property(AbstractMetaBuilderPrivate *b,
-                        AbstractMetaClass *metaClass,
+                        const AbstractMetaClassPtr &metaClass,
                         const QString &declarationIn,
                         const QStringList &scopes,
                         QString *errorMessage);
@@ -79,11 +58,14 @@ public:
     const AbstractMetaType &type() const;
     void setType(const AbstractMetaType &t);
 
-    const TypeEntry *typeEntry() const;
+    TypeEntryCPtr typeEntry() const;
 
     QString name() const;
     void setName(const QString &name);
 
+    Documentation documentation() const;
+    void setDocumentation(const Documentation &doc);
+
     QString read() const;
     void setRead(const QString &read);
 
@@ -97,6 +79,9 @@ public:
     QString reset() const;
     void setReset(const QString &reset);
 
+    QString notify() const; // Q_PROPERTY/C++ only
+    void setNotify(const QString &notify);
+
     int index() const;
     void setIndex(int index);