diff options
Diffstat (limited to 'src/declarative/qml/qdeclarativecontext.h')
-rw-r--r-- | src/declarative/qml/qdeclarativecontext.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/declarative/qml/qdeclarativecontext.h b/src/declarative/qml/qdeclarativecontext.h index 0fb9bee..a349628 100644 --- a/src/declarative/qml/qdeclarativecontext.h +++ b/src/declarative/qml/qdeclarativecontext.h @@ -58,6 +58,7 @@ class QDeclarativeEngine; class QDeclarativeRefCount; class QDeclarativeContextPrivate; class QDeclarativeCompositeTypeData; +class QDeclarativeContextData; class Q_DECLARATIVE_EXPORT QDeclarativeContext : public QObject { @@ -72,11 +73,12 @@ public: QDeclarativeEngine *engine() const; QDeclarativeContext *parentContext() const; - void addDefaultObject(QObject *); - void setContextProperty(const QString &, QObject *); - void setContextProperty(const QString &, const QVariant &); + QObject *contextObject() const; + void setContextObject(QObject *); QVariant contextProperty(const QString &) const; + void setContextProperty(const QString &, QObject *); + void setContextProperty(const QString &, const QVariant &); QUrl resolvedUrl(const QUrl &); @@ -95,7 +97,8 @@ private: friend class QDeclarativeComponentPrivate; friend class QDeclarativeScriptPrivate; friend class QDeclarativeBoundSignalProxy; - QDeclarativeContext(QDeclarativeContext *parent, QObject *objParent, bool); + friend class QDeclarativeContextData; + QDeclarativeContext(QDeclarativeContextData *); QDeclarativeContext(QDeclarativeEngine *, bool); }; QT_END_NAMESPACE |