diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-12-17 03:20:27 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-12-17 03:20:27 (GMT) |
| commit | a79eb9bb4f7dd4f552c1e48f3e2680910eb2bc2b (patch) | |
| tree | fd937b17b42edf33b188afbb4a740c2b16022c38 /src/declarative/qml/qmlobjectscriptclass.cpp | |
| parent | 9165afd37c0a5092709ebf04d1cdf242b0eec634 (diff) | |
| parent | 1178d3d62008873d7e8ce28e1671dd6c2b43b581 (diff) | |
| download | Qt-a79eb9bb4f7dd4f552c1e48f3e2680910eb2bc2b.zip Qt-a79eb9bb4f7dd4f552c1e48f3e2680910eb2bc2b.tar.gz Qt-a79eb9bb4f7dd4f552c1e48f3e2680910eb2bc2b.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlobjectscriptclass.cpp')
| -rw-r--r-- | src/declarative/qml/qmlobjectscriptclass.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/declarative/qml/qmlobjectscriptclass.cpp b/src/declarative/qml/qmlobjectscriptclass.cpp index 3d0581d..30d4422 100644 --- a/src/declarative/qml/qmlobjectscriptclass.cpp +++ b/src/declarative/qml/qmlobjectscriptclass.cpp @@ -306,6 +306,11 @@ void QmlObjectScriptClass::setProperty(QObject *obj, QmlMetaPropertyPrivate::write(obj, *lastData, v, evalContext); } +bool QmlObjectScriptClass::isQObject() const +{ + return true; +} + QObject *QmlObjectScriptClass::toQObject(Object *object, bool *ok) { if (ok) *ok = true; |