diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2011-06-06 15:19:50 +1000 |
---|---|---|
committer | Alan Alpert <alan.alpert@nokia.com> | 2011-06-06 15:19:50 +1000 |
commit | 6e22ead1767d0ef9463b34bee071ca54647a547c (patch) | |
tree | e347fbc15f8695027930eac80ea9a437229cb57b /src/declarative/util | |
parent | 6dbd4286eb19e9ac45665046a43342bcdc8b127e (diff) | |
parent | b6b1aebf480ef84d8b2b3a7fc338493811cc2ee0 (diff) |
Merge branch 'master' into qtquick2
Conflicts:
src/declarative/graphicsitems/qdeclarativetextinput.cpp
src/declarative/qml/qdeclarativeengine.cpp
Diffstat (limited to 'src/declarative/util')
-rw-r--r-- | src/declarative/util/qdeclarativeview.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativeview.cpp b/src/declarative/util/qdeclarativeview.cpp index e24f80f1d2..628c82c90e 100644 --- a/src/declarative/util/qdeclarativeview.cpp +++ b/src/declarative/util/qdeclarativeview.cpp @@ -49,6 +49,7 @@ #include <qdeclarativeguard_p.h> #include <private/qdeclarativedebugtrace_p.h> +#include <private/qdeclarativeobserverservice_p.h> #include <qscriptvalueiterator.h> #include <qdebug.h> @@ -299,6 +300,8 @@ void QDeclarativeViewPrivate::init() q->viewport()->setAttribute(Qt::WA_OpaquePaintEvent); q->viewport()->setAttribute(Qt::WA_NoSystemBackground); #endif + + QDeclarativeObserverService::instance()->addView(q); } /*! @@ -306,6 +309,7 @@ void QDeclarativeViewPrivate::init() */ QDeclarativeView::~QDeclarativeView() { + QDeclarativeObserverService::instance()->removeView(this); } /*! \property QDeclarativeView::source @@ -558,7 +562,6 @@ void QDeclarativeView::continueExecute() emit statusChanged(status()); } - /*! \internal */ |