diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-07-22 06:10:02 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-07-22 06:10:02 (GMT) |
| commit | 16cafa618c31db1cb3594767701751c489ce88b9 (patch) | |
| tree | 18fd1516a6590e937f7fba157a0289c4f74a6675 /src/declarative/qml | |
| parent | 58b9468d70fcfdd178f17e89d163c6f9879221d8 (diff) | |
| parent | 0767c2ff719a35c16c72fac97e6ff612e8c71e21 (diff) | |
| download | Qt-16cafa618c31db1cb3594767701751c489ce88b9.zip Qt-16cafa618c31db1cb3594767701751c489ce88b9.tar.gz Qt-16cafa618c31db1cb3594767701751c489ce88b9.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/qml')
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 4 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index 9dae64d..e3ebca3 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -578,9 +578,9 @@ void QDeclarativeEngine::clearComponentCache() component instances should be added to sub-contexts parented to the root context. */ -QDeclarativeContext *QDeclarativeEngine::rootContext() +QDeclarativeContext *QDeclarativeEngine::rootContext() const { - Q_D(QDeclarativeEngine); + Q_D(const QDeclarativeEngine); return d->rootContext; } diff --git a/src/declarative/qml/qdeclarativeengine.h b/src/declarative/qml/qdeclarativeengine.h index 01487f5..d971d80 100644 --- a/src/declarative/qml/qdeclarativeengine.h +++ b/src/declarative/qml/qdeclarativeengine.h @@ -74,7 +74,7 @@ public: QDeclarativeEngine(QObject *p = 0); virtual ~QDeclarativeEngine(); - QDeclarativeContext *rootContext(); + QDeclarativeContext *rootContext() const; void clearComponentCache(); |