From c83770853612d1ca596aa9a7af81555d4e193507 Mon Sep 17 00:00:00 2001 From: Jason Barron Date: Thu, 9 Jul 2009 18:04:44 +0200 Subject: Compile the OpenGL2 paint engine after the QScopedPointer changes This part of the code was not tested on Symbian so it's failure went unnoticed. This should get it compiling on platforms that use the OpenGL2 paint engine. --- src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 6 +++--- 1 file 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(d->ctx->d_ptr->active_engine); - QGL2PaintEngineExPrivate *p = static_cast(engine->d_ptr); + QGL2PaintEngineExPrivate *p = static_cast(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(ctx->d_ptr->active_engine); if (engine && engine->isActive()) { - QGL2PaintEngineExPrivate *p = static_cast(engine->d_ptr); + QGL2PaintEngineExPrivate *p = static_cast(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(ctx->d_ptr->active_engine); if (engine && engine->isActive()) { - QGL2PaintEngineExPrivate *p = static_cast(engine->d_ptr); + QGL2PaintEngineExPrivate *p = static_cast(engine->d_ptr.data()); p->transferMode(BrushDrawingMode); p->drawable.doneCurrent(); } -- cgit v0.12