summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlengine.h
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2009-07-03 06:14:22 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2009-07-03 06:14:22 (GMT)
commit26fab96a7827cf7ac250fb434715840195258608 (patch)
treef43816824fb34db0db29210ac4c1803d1baeff5f /src/declarative/qml/qmlengine.h
parentc329d989054ba21698a2de9b73a1e005e49ba916 (diff)
parent6c7b88af807cbd2b4d824b8fca0f199ae1413432 (diff)
downloadQt-26fab96a7827cf7ac250fb434715840195258608.zip
Qt-26fab96a7827cf7ac250fb434715840195258608.tar.gz
Qt-26fab96a7827cf7ac250fb434715840195258608.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlengine.h')
-rw-r--r--src/declarative/qml/qmlengine.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/qml/qmlengine.h b/src/declarative/qml/qmlengine.h
index f600520..c4259ce 100644
--- a/src/declarative/qml/qmlengine.h
+++ b/src/declarative/qml/qmlengine.h
@@ -104,6 +104,7 @@ private:
friend class QmlContext;
friend class QmlContextPrivate;
friend class QmlExpression;
+ friend class QmlExpressionPrivate;
friend class QmlBasicScript;
friend class QmlVME;
friend class QmlComponent;