diff options
author | Jason Barron <jbarron@trolltech.com> | 2009-07-09 16:04:44 (GMT) |
---|---|---|
committer | Jason Barron <jbarron@trolltech.com> | 2009-07-09 16:04:44 (GMT) |
commit | c83770853612d1ca596aa9a7af81555d4e193507 (patch) | |
tree | 07b231eb2cec78d30c2fc6365a4d30f601f661fa | |
parent | 4cb488fdc147d1ffc6807a825c5ea961404265e9 (diff) | |
download | Qt-c83770853612d1ca596aa9a7af81555d4e193507.zip Qt-c83770853612d1ca596aa9a7af81555d4e193507.tar.gz Qt-c83770853612d1ca596aa9a7af81555d4e193507.tar.bz2 |
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.
-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(); } |