summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlengine.h
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-07-16 07:36:35 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-07-16 07:36:35 (GMT)
commit9df0a5e79c268e4e8cc2fa0f9d4c88fefc146305 (patch)
tree0d6127a5e4f58f95b44d463e7d33954465d92098 /src/declarative/qml/qmlengine.h
parente337d74c2be957d356216b01c93299a2992a128b (diff)
parentc02bfff71cc56582e0898864d8c13047fa86756d (diff)
downloadQt-9df0a5e79c268e4e8cc2fa0f9d4c88fefc146305.zip
Qt-9df0a5e79c268e4e8cc2fa0f9d4c88fefc146305.tar.gz
Qt-9df0a5e79c268e4e8cc2fa0f9d4c88fefc146305.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.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/declarative/qml/qmlengine.h b/src/declarative/qml/qmlengine.h
index 3e402d8..98deba7 100644
--- a/src/declarative/qml/qmlengine.h
+++ b/src/declarative/qml/qmlengine.h
@@ -70,10 +70,7 @@ public:
QmlEngine(QObject *p = 0);
virtual ~QmlEngine();
- static QmlEngine *activeEngine();
-
QmlContext *rootContext();
- QmlContext *activeContext();
void clearComponentCache();