diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-07-14 04:26:32 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-07-14 04:26:32 (GMT) |
| commit | 799380ea82ced8cc5eb4eed5b1306748125331fa (patch) | |
| tree | 41140bd1687211ae305f7b0e0f1cd2d413db3c94 /src/declarative/qml/qmlcontext.h | |
| parent | a093c5ef65aa2c28f52f78c8be5bbe7d567646fa (diff) | |
| parent | 59b3e3ba52891197510115f912e7934ac1784d7c (diff) | |
| download | Qt-799380ea82ced8cc5eb4eed5b1306748125331fa.zip Qt-799380ea82ced8cc5eb4eed5b1306748125331fa.tar.gz Qt-799380ea82ced8cc5eb4eed5b1306748125331fa.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/parser/qmljsparser.cpp
Diffstat (limited to 'src/declarative/qml/qmlcontext.h')
| -rw-r--r-- | src/declarative/qml/qmlcontext.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlcontext.h b/src/declarative/qml/qmlcontext.h index e0b6d7b..77f6634 100644 --- a/src/declarative/qml/qmlcontext.h +++ b/src/declarative/qml/qmlcontext.h @@ -62,6 +62,7 @@ class Q_DECLARATIVE_EXPORT QmlContext : public QObject Q_DECLARE_PRIVATE(QmlContext) public: + QmlContext(QmlEngine *parent, QObject *objParent=0); QmlContext(QmlContext *parent, QObject *objParent=0); virtual ~QmlContext(); @@ -85,6 +86,7 @@ private Q_SLOTS: void objectDestroyed(QObject *); private: + friend class QmlVME; friend class QmlEngine; friend class QmlEnginePrivate; friend class QmlExpression; @@ -96,7 +98,8 @@ private: friend class QmlScriptPrivate; friend class QmlBoundSignalProxy; friend class QmlSimpleDeclarativeData; - QmlContext(QmlEngine *); + QmlContext(QmlContext *parent, QObject *objParent, bool); + QmlContext(QmlEngine *, bool); }; QT_END_NAMESPACE |