diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-08-04 12:12:57 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-08-04 12:12:57 (GMT) |
| commit | babf1ff43584b454ac24728fbf93bf291b9f36d1 (patch) | |
| tree | c1d7567183d4a124fd4417a23e558d4fcef847ad /src/declarative/util/qdeclarativeview.h | |
| parent | 05e8e8056824dfa56830e12a6a50ec39018df6fc (diff) | |
| parent | a6633a9cf1bb2083d0ce41f4667b3f9349a39865 (diff) | |
| download | Qt-babf1ff43584b454ac24728fbf93bf291b9f36d1.zip Qt-babf1ff43584b454ac24728fbf93bf291b9f36d1.tar.gz Qt-babf1ff43584b454ac24728fbf93bf291b9f36d1.tar.bz2 | |
Merge remote branch 'qt/master' into lighthouse-master
Conflicts:
configure
Diffstat (limited to 'src/declarative/util/qdeclarativeview.h')
| -rw-r--r-- | src/declarative/util/qdeclarativeview.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/util/qdeclarativeview.h b/src/declarative/util/qdeclarativeview.h index cdcf134..d3e4948 100644 --- a/src/declarative/util/qdeclarativeview.h +++ b/src/declarative/util/qdeclarativeview.h @@ -75,8 +75,8 @@ public: QUrl source() const; void setSource(const QUrl&); - QDeclarativeEngine* engine(); - QDeclarativeContext* rootContext(); + QDeclarativeEngine* engine() const; + QDeclarativeContext* rootContext() const; QGraphicsObject *rootObject() const; |