diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-09-02 05:03:59 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-09-02 05:03:59 (GMT) |
| commit | b6e26ee808ae3ffe1c4fba03cc89baf47d65d3a8 (patch) | |
| tree | 3bd183873adbdde44c4c5335c856b914ad3d476c /src/declarative/qml/qmlengine_p.h | |
| parent | c3af2cb805d1ac5f7a5a944a23dc4c4238f8f530 (diff) | |
| parent | 2fc0161b46597bf64a8f88f027f3b98a021a8242 (diff) | |
| download | Qt-b6e26ee808ae3ffe1c4fba03cc89baf47d65d3a8.zip Qt-b6e26ee808ae3ffe1c4fba03cc89baf47d65d3a8.tar.gz Qt-b6e26ee808ae3ffe1c4fba03cc89baf47d65d3a8.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_p.h')
| -rw-r--r-- | src/declarative/qml/qmlengine_p.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h index 1e251cc..a33add3 100644 --- a/src/declarative/qml/qmlengine_p.h +++ b/src/declarative/qml/qmlengine_p.h @@ -114,7 +114,6 @@ public: QPODVector<CapturedProperty> capturedProperties; QmlContext *rootContext; - QmlContext *currentBindContext; // ### Remove me QmlExpression *currentExpression; bool isDebugging; #ifdef QT_SCRIPTTOOLS_LIB @@ -128,9 +127,6 @@ public: QScriptClass *nodeListClass; QScriptClass *namedNodeMapClass; - QmlContext *setCurrentBindContext(QmlContext *); - QStack<QmlContext *> activeContexts; // ### Remove me - struct QmlScriptEngine : public QScriptEngine { QmlScriptEngine(QmlEnginePrivate *priv) |