diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-03-24 22:22:18 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-03-24 22:22:18 (GMT) |
| commit | 3b19434cf0bef753927701ca1d35876f24ff21b7 (patch) | |
| tree | d273a07cdd0c8a731fdae3665f75052ce436f1d2 /src/declarative/qml/qdeclarativecontext_p.h | |
| parent | 84a14c182d7691ea919c335453771b41d8a7ed25 (diff) | |
| parent | 3039c483cd2c402457e7f9cbc672ec9254d09c57 (diff) | |
| download | Qt-3b19434cf0bef753927701ca1d35876f24ff21b7.zip Qt-3b19434cf0bef753927701ca1d35876f24ff21b7.tar.gz Qt-3b19434cf0bef753927701ca1d35876f24ff21b7.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_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativecontext_p.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativecontext_p.h b/src/declarative/qml/qdeclarativecontext_p.h index e5f18b3..397f37a 100644 --- a/src/declarative/qml/qdeclarativecontext_p.h +++ b/src/declarative/qml/qdeclarativecontext_p.h @@ -213,8 +213,11 @@ public: inline operator QDeclarativeContextData*() const { return m_contextData; } inline QDeclarativeContextData* operator->() const { return m_contextData; } + inline QDeclarativeGuardedContextData &operator=(QDeclarativeContextData *d); private: + QDeclarativeGuardedContextData &operator=(const QDeclarativeGuardedContextData &); + QDeclarativeGuardedContextData(const QDeclarativeGuardedContextData &); friend class QDeclarativeContextData; inline void clear(); @@ -269,6 +272,13 @@ void QDeclarativeGuardedContextData::clear() } } +QDeclarativeGuardedContextData & +QDeclarativeGuardedContextData::operator=(QDeclarativeContextData *d) +{ + setContextData(d); + return *this; +} + QT_END_NAMESPACE #endif // QDECLARATIVECONTEXT_P_H |