diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2010-03-11 08:00:54 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2010-03-11 08:00:54 (GMT) |
| commit | c97ea1ca81cc94d4a7e0e6bd579fa35fb1cf3b91 (patch) | |
| tree | feae028a1139b1e3d63f729dcb45689c4d5784fa /src/declarative/qml/qdeclarativecontext.h | |
| parent | af7e91af39ea6e9bb64794d7be2f4ade52c17be2 (diff) | |
| parent | 9e504323b679d7fedfcfd975f202cc6dd96c9dcb (diff) | |
| download | Qt-c97ea1ca81cc94d4a7e0e6bd579fa35fb1cf3b91.zip Qt-c97ea1ca81cc94d4a7e0e6bd579fa35fb1cf3b91.tar.gz Qt-c97ea1ca81cc94d4a7e0e6bd579fa35fb1cf3b91.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/qml/qdeclarativecontext.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativecontext.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/declarative/qml/qdeclarativecontext.h b/src/declarative/qml/qdeclarativecontext.h index 0fb9bee..3ad9863 100644 --- a/src/declarative/qml/qdeclarativecontext.h +++ b/src/declarative/qml/qdeclarativecontext.h @@ -72,11 +72,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 &); |