summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativecontext.h
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-03-11 07:53:42 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-03-11 07:54:35 (GMT)
commit303730a3fdd399a3e0a65b08338b4db75aa2acee (patch)
tree4d265dfdf43a214a44f2f1e0408f6e873a1c671e /src/declarative/qml/qdeclarativecontext.h
parent79dc9daa146410c7da8d4691e9a4489251980ab3 (diff)
downloadQt-303730a3fdd399a3e0a65b08338b4db75aa2acee.zip
Qt-303730a3fdd399a3e0a65b08338b4db75aa2acee.tar.gz
Qt-303730a3fdd399a3e0a65b08338b4db75aa2acee.tar.bz2
Replace QDeclarativeContext::addDefaultObject() -> setContextObject()
It is faster and easier to use to just support a single context object.
Diffstat (limited to 'src/declarative/qml/qdeclarativecontext.h')
-rw-r--r--src/declarative/qml/qdeclarativecontext.h7
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 &);