1 files changed, 42 insertions, 16 deletions

diff --git a/src/qml/qml/qqmlglobal_p.h b/src/qml/qml/qqmlglobal_p.h
index 918f95993f..98fe2e6a79 100644
--- a/src/qml/qml/qqmlglobal_p.h
+++ b/src/qml/qml/qqmlglobal_p.h
@@ -16,8 +16,9 @@
 //
 
 #include <private/qmetaobject_p.h>
-#include <private/qtqmlglobal_p.h>
 #include <private/qqmlmetaobject_p.h>
+#include <private/qqmltype_p.h>
+#include <private/qtqmlglobal_p.h>
 
 #include <QtQml/qqml.h>
 #include <QtCore/qobject.h>
@@ -48,7 +49,7 @@ T qmlGetConfigOption(const char *var)
     Connect \a Signal of \a Sender to \a Method of \a Receiver.  \a Signal must be
     of type \a SenderType and \a Receiver of type \a ReceiverType.
 
-    Unlike QObject::connect(), this method caches the lookup of the signal and method
+    Unlike QObject::connect(), this macro caches the lookup of the signal and method
     indexes.  It also does not require lazy QMetaObjects to be built so should be
     preferred in all QML code that might interact with QML built objects.
 
@@ -87,7 +88,7 @@ do { \
     Disconnect \a Signal of \a Sender from \a Method of \a Receiver.  \a Signal must be
     of type \a SenderType and \a Receiver of type \a ReceiverType.
 
-    Unlike QObject::disconnect(), this method caches the lookup of the signal and method
+    Unlike QObject::disconnect(), this macro caches the lookup of the signal and method
     indexes.  It also does not require lazy QMetaObjects to be built so should be
     preferred in all QML code that might interact with QML built objects.
 
@@ -122,6 +123,9 @@ do { \
     QMetaObject::disconnect(sender, signalIdx, receiver, methodIdx); \
 } while (0)
 
+Q_QML_EXPORT bool qmlobject_can_cpp_cast(QObject *object, const QMetaObject *mo);
+Q_QML_EXPORT bool qmlobject_can_qml_cast(QObject *object, const QQmlType &type);
+
 /*!
     This method is identical to qobject_cast<T>() except that it does not require lazy
     QMetaObjects to be built, so should be preferred in all QML code that might interact
@@ -137,12 +141,25 @@ do { \
 template<class T>
 T qmlobject_cast(QObject *object)
 {
-    if (object && QQmlMetaObject::canConvert(object, &reinterpret_cast<T>(object)->staticMetaObject))
+    if (!object)
+        return nullptr;
+    if (qmlobject_can_cpp_cast(object, &(std::remove_pointer_t<T>::staticMetaObject)))
         return static_cast<T>(object);
     else
         return nullptr;
 }
 
+class QQuickItem;
+template<>
+inline QQuickItem *qmlobject_cast<QQuickItem *>(QObject *object)
+{
+    if (!object || !object->isQuickItemType())
+        return nullptr;
+    // QQuickItem is incomplete here -> can't use static_cast
+    // but we don't need any pointer adjustment, so reinterpret is safe
+    return reinterpret_cast<QQuickItem *>(object);
+}
+
 #define IS_SIGNAL_CONNECTED(Sender, SenderType, Name, Arguments) \
 do { \
     QObject *sender = (Sender); \
@@ -189,15 +206,24 @@ inline void QQml_setParent_noEvent(QObject *object, QObject *parent)
 class QQmlValueTypeProvider
 {
 public:
-    static bool constructFromJSValue(const QJSValue &, QMetaType, void *);
-
-    static bool createValueType(const QString &, QMetaType, void *);
-    static bool createValueType(const QJSValue &, QMetaType, void *);
-    static bool createValueType(const QV4::Value &, QMetaType, void *);
-    static bool createValueType(const QVariant &, QMetaType, void *);
+    static bool populateValueType(
+            QMetaType targetMetaType, void *target, const QV4::Value &source);
+    static bool populateValueType(
+            QMetaType targetMetaType, void *target, QMetaType sourceMetaType, void *source);
+
+    static Q_QML_EXPORT void *heapCreateValueType(
+            const QQmlType &targetType, const QV4::Value &source);
+    static QVariant constructValueType(
+            QMetaType targetMetaType, const QMetaObject *targetMetaObject,
+            int ctorIndex, void *ctorArg);
+
+    static QVariant createValueType(const QJSValue &, QMetaType);
+    static QVariant createValueType(const QString &, QMetaType);
+    static QVariant createValueType(const QV4::Value &, QMetaType);
+    static QVariant createValueType(const QVariant &, QMetaType);
 };
 
-class Q_QML_PRIVATE_EXPORT QQmlColorProvider
+class Q_QML_EXPORT QQmlColorProvider
 {
 public:
     virtual ~QQmlColorProvider();
@@ -213,11 +239,11 @@ public:
     virtual QVariant tint(const QVariant &, const QVariant &);
 };
 
-Q_QML_PRIVATE_EXPORT QQmlColorProvider *QQml_setColorProvider(QQmlColorProvider *);
-Q_QML_PRIVATE_EXPORT QQmlColorProvider *QQml_colorProvider();
+Q_QML_EXPORT QQmlColorProvider *QQml_setColorProvider(QQmlColorProvider *);
+Q_QML_EXPORT QQmlColorProvider *QQml_colorProvider();
 
 class QQmlApplication;
-class Q_QML_PRIVATE_EXPORT QQmlGuiProvider
+class Q_QML_EXPORT QQmlGuiProvider
 {
 public:
     virtual ~QQmlGuiProvider();
@@ -229,12 +255,12 @@ public:
     virtual QString pluginName() const;
 };
 
-Q_QML_PRIVATE_EXPORT QQmlGuiProvider *QQml_setGuiProvider(QQmlGuiProvider *);
+Q_QML_EXPORT QQmlGuiProvider *QQml_setGuiProvider(QQmlGuiProvider *);
 Q_AUTOTEST_EXPORT QQmlGuiProvider *QQml_guiProvider();
 
 class QQmlApplicationPrivate;
 
-class Q_QML_PRIVATE_EXPORT QQmlApplication : public QObject
+class Q_QML_EXPORT QQmlApplication : public QObject
 {
     //Application level logic, subclassed by Qt Quick if available via QQmlGuiProvider
     Q_OBJECT