diff options
| author | axis <qt-info@nokia.com> | 2009-07-09 16:08:43 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-07-09 16:08:43 (GMT) |
| commit | 5c53ea55e54f6371082a8ce7c3965f2fe54fcef5 (patch) | |
| tree | c5c67d8b2e70de394b21027e0d9e3f3f5be19b61 | |
| parent | da5934a205d9b16e344b97c36457c7636456127f (diff) | |
| parent | c83770853612d1ca596aa9a7af81555d4e193507 (diff) | |
| download | Qt-5c53ea55e54f6371082a8ce7c3965f2fe54fcef5.zip Qt-5c53ea55e54f6371082a8ce7c3965f2fe54fcef5.tar.gz Qt-5c53ea55e54f6371082a8ce7c3965f2fe54fcef5.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
| -rw-r--r-- | src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp index 4bf5d4c..c4f5891 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp @@ -1162,7 +1162,7 @@ bool QGL2PaintEngineEx::begin(QPaintDevice *pdev) if (d->ctx->d_ptr->active_engine) { QGL2PaintEngineEx *engine = static_cast<QGL2PaintEngineEx *>(d->ctx->d_ptr->active_engine); - QGL2PaintEngineExPrivate *p = static_cast<QGL2PaintEngineExPrivate *>(engine->d_ptr); + QGL2PaintEngineExPrivate *p = static_cast<QGL2PaintEngineExPrivate *>(engine->d_ptr.data()); p->transferMode(BrushDrawingMode); p->drawable.doneCurrent(); } @@ -1266,7 +1266,7 @@ bool QGL2PaintEngineEx::end() if (ctx->d_ptr->active_engine != this) { QGL2PaintEngineEx *engine = static_cast<QGL2PaintEngineEx *>(ctx->d_ptr->active_engine); if (engine && engine->isActive()) { - QGL2PaintEngineExPrivate *p = static_cast<QGL2PaintEngineExPrivate *>(engine->d_ptr); + QGL2PaintEngineExPrivate *p = static_cast<QGL2PaintEngineExPrivate *>(engine->d_ptr.data()); p->transferMode(BrushDrawingMode); p->drawable.doneCurrent(); } @@ -1290,7 +1290,7 @@ void QGL2PaintEngineEx::ensureActive() if (isActive() && ctx->d_ptr->active_engine != this) { QGL2PaintEngineEx *engine = static_cast<QGL2PaintEngineEx *>(ctx->d_ptr->active_engine); if (engine && engine->isActive()) { - QGL2PaintEngineExPrivate *p = static_cast<QGL2PaintEngineExPrivate *>(engine->d_ptr); + QGL2PaintEngineExPrivate *p = static_cast<QGL2PaintEngineExPrivate *>(engine->d_ptr.data()); p->transferMode(BrushDrawingMode); p->drawable.doneCurrent(); } |