diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-03-22 13:03:11 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-03-22 13:03:11 (GMT) |
| commit | acc903853d5ac54d646d324b7386c998bc07d464 (patch) | |
| tree | f2ed3ccc611cebb70a4af7920a0fd0eec4ba5d73 /src/declarative/util/qdeclarativeview.cpp | |
| parent | 56b4ada44ea5bfa1c4ee669aa00e9ae960965fe3 (diff) | |
| parent | bf95c0ed87bf8a2ccd0a3d57ed81b8ae8fb8c4f2 (diff) | |
| download | Qt-acc903853d5ac54d646d324b7386c998bc07d464.zip Qt-acc903853d5ac54d646d324b7386c998bc07d464.tar.gz Qt-acc903853d5ac54d646d324b7386c998bc07d464.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/examples/qml-examples.qdoc
Diffstat (limited to 'src/declarative/util/qdeclarativeview.cpp')
| -rw-r--r-- | src/declarative/util/qdeclarativeview.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/declarative/util/qdeclarativeview.cpp b/src/declarative/util/qdeclarativeview.cpp index de61169..dcc078d 100644 --- a/src/declarative/util/qdeclarativeview.cpp +++ b/src/declarative/util/qdeclarativeview.cpp @@ -293,6 +293,13 @@ void QDeclarativeViewPrivate::init() q->setFocusPolicy(Qt::StrongFocus); q->scene()->setStickyFocus(true); //### needed for correct focus handling + +#ifdef QDECLARATIVEVIEW_NOBACKGROUND + q->setAttribute(Qt::WA_OpaquePaintEvent); + q->setAttribute(Qt::WA_NoSystemBackground); + q->viewport()->setAttribute(Qt::WA_OpaquePaintEvent); + q->viewport()->setAttribute(Qt::WA_NoSystemBackground); +#endif } /*! |