diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2010-01-11 01:01:18 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2010-01-11 01:01:18 (GMT) |
| commit | 31cc1b382fbcd77def12cd0ad4fe9fc0fabdf60b (patch) | |
| tree | 8ff8e1845d1ebf78507ffb0c52d33bda7f5ceeee /src/script/bridge | |
| parent | 3f3e86d6fce5bb781bc41def35d0f15c58ef769c (diff) | |
| download | Qt-31cc1b382fbcd77def12cd0ad4fe9fc0fabdf60b.zip Qt-31cc1b382fbcd77def12cd0ad4fe9fc0fabdf60b.tar.gz Qt-31cc1b382fbcd77def12cd0ad4fe9fc0fabdf60b.tar.bz2 | |
Correctly determine QScriptValue::isQObject() for QObjects using the
QScriptDeclarativeClass.
Task-number: QTBUG-6178
Reviewed-by: Kent Hansen
Reviewed-by: Aaron Kennedy
Diffstat (limited to 'src/script/bridge')
| -rw-r--r-- | src/script/bridge/qscriptdeclarativeclass.cpp | 5 | ||||
| -rw-r--r-- | src/script/bridge/qscriptdeclarativeclass_p.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/script/bridge/qscriptdeclarativeclass.cpp b/src/script/bridge/qscriptdeclarativeclass.cpp index df00ce9..5e363d2 100644 --- a/src/script/bridge/qscriptdeclarativeclass.cpp +++ b/src/script/bridge/qscriptdeclarativeclass.cpp @@ -319,6 +319,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); |