summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlobjectscriptclass_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/declarative/qml/qmlobjectscriptclass_p.h')
-rw-r--r--src/declarative/qml/qmlobjectscriptclass_p.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlobjectscriptclass_p.h b/src/declarative/qml/qmlobjectscriptclass_p.h
index 3fcf009..7fb727e 100644
--- a/src/declarative/qml/qmlobjectscriptclass_p.h
+++ b/src/declarative/qml/qmlobjectscriptclass_p.h
@@ -70,8 +70,9 @@ public:
QmlObjectScriptClass(QmlEngine *);
~QmlObjectScriptClass();
- QScriptValue newQObject(QObject *);
+ QScriptValue newQObject(QObject *, int type = QMetaType::QObjectStar);
QObject *toQObject(const QScriptValue &) const;
+ int objectType(const QScriptValue &) const;
enum QueryMode { IncludeAttachedProperties, SkipAttachedProperties };
@@ -79,7 +80,8 @@ public:
QScriptClass::QueryFlags flags,
QmlContext *evalContext);
QScriptValue property(QObject *, const Identifier &);
- void setProperty(QObject *, const Identifier &name, const QScriptValue &);
+ void setProperty(QObject *, const Identifier &name, const QScriptValue &,
+ QmlContext *evalContext = 0);
protected:
virtual QScriptClass::QueryFlags queryProperty(Object *, const Identifier &,