Correctly determine QScriptValue::isQObject() for QObjects using the

QScriptDeclarativeClass.

This allows us to pass QObjects to QML-defined functions which expect
a QVariant (and will presumably help in other cases where we expect
transparent QObject <-> QVariant conversion in the engine).

Task-number: QTBUG-6178
Reviewed-by: Aaron Kennedy

2 files changed, 6 insertions, 0 deletions

diff --git a/src/script/bridge/qscriptdeclarativeclass.cpp b/src/script/bridge/qscriptdeclarativeclass.cpp
index 98b3e26..2c13066 100644
--- a/src/script/bridge/qscriptdeclarativeclass.cpp
+++ b/src/script/bridge/qscriptdeclarativeclass.cpp
@@ -320,6 +320,11 @@ QStringList QScriptDeclarativeClass::propertyNames(Object *object)
     return QStringList();
 }
 
+bool QScriptDeclarativeClass::isQObject() const
+{
+    return false;
+}
+
 QObject *QScriptDeclarativeClass::toQObject(Object *, bool *ok)
 {
     if (ok) *ok = false;
diff --git a/src/script/bridge/qscriptdeclarativeclass_p.h b/src/script/bridge/qscriptdeclarativeclass_p.h
index 40e5051..f2557bd 100644
--- a/src/script/bridge/qscriptdeclarativeclass_p.h
+++ b/src/script/bridge/qscriptdeclarativeclass_p.h
@@ -97,6 +97,7 @@ public:
 
     virtual QStringList propertyNames(Object *);
 
+    virtual bool isQObject() const;
     virtual QObject *toQObject(Object *, bool *ok = 0);
     virtual QVariant toVariant(Object *, bool *ok = 0);