diff options
| author | Jerome Pasion <jerome.pasion@digia.com> | 2012-11-02 14:59:56 +0100 |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@digia.com> | 2012-11-02 15:02:08 +0100 |
| commit | 47c45bb1e487b3823281683c1110d9269f144582 (patch) | |
| tree | 4c687d46d9aa7d90f064a25e6c7f0241ae28e16d /examples/quick/scenegraph/openglunderqml/squircle.cpp | |
| parent | 677be9a27770ff48dd771ec4fc1c66139aac4aa8 (diff) | |
| parent | 7d94fa8e074ba816751c60bd0ad3c63b3c0b0a27 (diff) | |
Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtdeclarative into newdocs
Change-Id: Icced038fbdb309d8928213d3753a27fe5a6b1137
Diffstat (limited to 'examples/quick/scenegraph/openglunderqml/squircle.cpp')
| -rw-r--r-- | examples/quick/scenegraph/openglunderqml/squircle.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/quick/scenegraph/openglunderqml/squircle.cpp b/examples/quick/scenegraph/openglunderqml/squircle.cpp index 24e8533d8e..867ce4a7e0 100644 --- a/examples/quick/scenegraph/openglunderqml/squircle.cpp +++ b/examples/quick/scenegraph/openglunderqml/squircle.cpp @@ -59,8 +59,8 @@ void Squircle::setT(qreal t) return; m_t = t; emit tChanged(); - if (canvas()) - canvas()->update(); + if (window()) + window()->update(); } //! [8] @@ -113,7 +113,7 @@ void Squircle::paint() m_program->bindAttributeLocation("vertices", 0); m_program->link(); - connect(canvas()->openglContext(), SIGNAL(aboutToBeDestroyed()), + connect(window()->openglContext(), SIGNAL(aboutToBeDestroyed()), this, SLOT(cleanup()), Qt::DirectConnection); } //! [4] //! [5] |