diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-07-09 07:10:11 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-07-09 07:10:11 (GMT) |
| commit | 5b56189c9a6c322fa595b716a9f17e39a35bcbc0 (patch) | |
| tree | 2e8b4fc397d631207aa32a8c68c94100a54f0f61 /src/declarative/qml/qmlcontext.h | |
| parent | 888f57107e698731c4a1dd2c46745c6293b2222e (diff) | |
| parent | 7343bbb230161d563b0226011e4519f695fdc593 (diff) | |
| download | Qt-5b56189c9a6c322fa595b716a9f17e39a35bcbc0.zip Qt-5b56189c9a6c322fa595b716a9f17e39a35bcbc0.tar.gz Qt-5b56189c9a6c322fa595b716a9f17e39a35bcbc0.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qmlengine.cpp
Diffstat (limited to 'src/declarative/qml/qmlcontext.h')
| -rw-r--r-- | src/declarative/qml/qmlcontext.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/qml/qmlcontext.h b/src/declarative/qml/qmlcontext.h index 44d8caa..e0b6d7b 100644 --- a/src/declarative/qml/qmlcontext.h +++ b/src/declarative/qml/qmlcontext.h @@ -88,6 +88,7 @@ private: friend class QmlEngine; friend class QmlEnginePrivate; friend class QmlExpression; + friend class QmlExpressionPrivate; friend class QmlBasicScript; friend class QmlContextScriptClass; friend class QmlObjectScriptClass; |