diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-10-02 09:31:12 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-10-05 02:40:50 (GMT) |
commit | 114adc64fe8deb7d59e608924355f64810f8fe64 (patch) | |
tree | 78c213ad20b7da939a0ea11c7afefa69c3e90fe6 /src/declarative/qml/qmlobjectscriptclass_p.h | |
parent | b4001abf71b3335cedfaf72ca3b7f25ea46be35c (diff) | |
download | Qt-114adc64fe8deb7d59e608924355f64810f8fe64.zip Qt-114adc64fe8deb7d59e608924355f64810f8fe64.tar.gz Qt-114adc64fe8deb7d59e608924355f64810f8fe64.tar.bz2 |
Fix attached properties/enums from ecmascript
Diffstat (limited to 'src/declarative/qml/qmlobjectscriptclass_p.h')
-rw-r--r-- | src/declarative/qml/qmlobjectscriptclass_p.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlobjectscriptclass_p.h b/src/declarative/qml/qmlobjectscriptclass_p.h index 6406f0d..6de63ca 100644 --- a/src/declarative/qml/qmlobjectscriptclass_p.h +++ b/src/declarative/qml/qmlobjectscriptclass_p.h @@ -56,6 +56,7 @@ #include <QtScript/qscriptclass.h> #include <private/qscriptdeclarativeclass_p.h> #include <private/qmlpropertycache_p.h> +#include <private/qmltypenamecache_p.h> QT_BEGIN_NAMESPACE @@ -71,8 +72,11 @@ public: QScriptValue newQObject(QObject *); QObject *toQObject(const QScriptValue &) const; + enum QueryMode { IncludeAttachedProperties, SkipAttachedProperties }; + QScriptClass::QueryFlags queryProperty(QObject *, const Identifier &, - QScriptClass::QueryFlags flags); + QScriptClass::QueryFlags flags, + QueryMode = IncludeAttachedProperties); QScriptValue property(QObject *, const Identifier &); void setProperty(QObject *, const Identifier &name, const QScriptValue &); @@ -85,6 +89,7 @@ protected: virtual QObject *toQObject(Object *, bool *ok = 0); private: + QmlTypeNameCache::Data *lastTNData; QmlPropertyCache::Data *lastData; QmlPropertyCache::Data local; |