projects
/
profile
/
ivi
/
qtdeclarative.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into v8
[profile/ivi/qtdeclarative.git]
/
src
/
declarative
/
qml
/
qdeclarativecontext.h
diff --git
a/src/declarative/qml/qdeclarativecontext.h
b/src/declarative/qml/qdeclarativecontext.h
index
d1d6d91
..
fd33ccd
100644
(file)
--- a/
src/declarative/qml/qdeclarativecontext.h
+++ b/
src/declarative/qml/qdeclarativecontext.h
@@
-94,8
+94,6
@@
private:
friend class QDeclarativeEnginePrivate;
friend class QDeclarativeExpression;
friend class QDeclarativeExpressionPrivate;
friend class QDeclarativeEnginePrivate;
friend class QDeclarativeExpression;
friend class QDeclarativeExpressionPrivate;
- friend class QDeclarativeContextScriptClass;
- friend class QDeclarativeObjectScriptClass;
friend class QDeclarativeComponent;
friend class QDeclarativeComponentPrivate;
friend class QDeclarativeScriptPrivate;
friend class QDeclarativeComponent;
friend class QDeclarativeComponentPrivate;
friend class QDeclarativeScriptPrivate;