Un-special case QQmlPropertyValueType

Change-Id: I5123f72fea4198505c27678dbaaea26313b2327c
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

4 files changed, 7 insertions, 28 deletions

diff --git a/src/qml/qml/qqmlmetatype.cpp b/src/qml/qml/qqmlmetatype.cpp
index f80698af6f..d44cb9fdce 100644
--- a/src/qml/qml/qqmlmetatype.cpp
+++ b/src/qml/qml/qqmlmetatype.cpp
@@ -1599,8 +1599,6 @@ const QMetaObject *QQmlMetaType::metaObjectForMetaType(QMetaType metaType)
         if (metaType == QMetaType::fromType<QItemSelectionRange>())
             return &QQmlItemSelectionRangeValueType::staticMetaObject;
 #endif
-        if (metaType == QMetaType::fromType<QQmlProperty>())
-            return &QQmlPropertyValueType::staticMetaObject;
         break;
     }
 
diff --git a/src/qml/qml/qqmlproperty.h b/src/qml/qml/qqmlproperty.h
index aa455101dc..696c0f7136 100644
--- a/src/qml/qml/qqmlproperty.h
+++ b/src/qml/qml/qqmlproperty.h
@@ -42,6 +42,7 @@
 
 #include <QtQml/qtqmlglobal.h>
 #include <QtCore/qmetaobject.h>
+#include <QtQml/qqmlregistration.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -54,6 +55,12 @@ class QQmlEngine;
 class QQmlPropertyPrivate;
 class Q_QML_EXPORT QQmlProperty
 {
+    Q_GADGET
+    QML_ANONYMOUS
+    QML_ADDED_IN_VERSION(2, 15)
+
+    Q_PROPERTY(QObject *object READ object CONSTANT FINAL)
+    Q_PROPERTY(QString name READ name CONSTANT FINAL)
 public:
     enum PropertyTypeCategory {
         InvalidCategory,
diff --git a/src/qml/qml/qqmlvaluetype.cpp b/src/qml/qml/qqmlvaluetype.cpp
index e1f56d0d59..d03cf04fa6 100644
--- a/src/qml/qml/qqmlvaluetype.cpp
+++ b/src/qml/qml/qqmlvaluetype.cpp
@@ -448,16 +448,6 @@ void QQmlEasingValueType::setBezierCurve(const QVariantList &customCurveVariant)
     v = newEasingCurve;
 }
 
-QObject *QQmlPropertyValueType::object() const
-{
-    return v.object();
-}
-
-QString QQmlPropertyValueType::name() const
-{
-    return v.name();
-}
-
 QVariantList QQmlEasingValueType::bezierCurve() const
 {
     QVariantList rv;
diff --git a/src/qml/qml/qqmlvaluetype_p.h b/src/qml/qml/qqmlvaluetype_p.h
index 632405f315..27a86691e3 100644
--- a/src/qml/qml/qqmlvaluetype_p.h
+++ b/src/qml/qml/qqmlvaluetype_p.h
@@ -330,22 +330,6 @@ public:
 };
 #endif
 
-struct Q_QML_PRIVATE_EXPORT QQmlPropertyValueType
-{
-    QQmlProperty v;
-    Q_PROPERTY(QObject *object READ object CONSTANT FINAL)
-    Q_PROPERTY(QString name READ name CONSTANT FINAL)
-    Q_GADGET
-    QML_ANONYMOUS
-    QML_FOREIGN(QQmlProperty)
-    QML_ADDED_IN_VERSION(2, 15)
-    QML_EXTENDED(QQmlPropertyValueType)
-
-public:
-    QObject *object() const;
-    QString name() const;
-};
-
 QT_END_NAMESPACE
 
 #endif  // QQMLVALUETYPE_P_H