diff options
author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-04 13:14:33 +0200 |
---|---|---|
committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-04 13:14:33 +0200 |
commit | 9631f6314cd90aab5594ee379ad2fabe7c8a4c95 (patch) | |
tree | 9a843d3f72a6bac33c5255e3adbfa26341af911b | |
parent | f838dcc050217507fd060d4c5dd093eb22ac95af (diff) |
Fix compilation of QtOpenGL.
-rw-r--r-- | src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 4 | ||||
-rw-r--r-- | src/opengl/qpaintengine_opengl.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp index 673f614c0d..a7c9411914 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp @@ -2357,8 +2357,8 @@ void QGL2PaintEngineExPrivate::systemStateChanged() if (systemClip.isEmpty()) { useSystemClip = false; } else { - if (q->paintDevice()->devType() == QInternal::Widget && currentClipWidget) { - QWidgetPrivate *widgetPrivate = qt_widget_private(currentClipWidget->window()); + if (q->paintDevice()->devType() == QInternal::Widget && currentClipDevice) { + QWidgetPrivate *widgetPrivate = qt_widget_private(static_cast<QWidget *>(currentClipDevice)->window()); useSystemClip = widgetPrivate->extra && widgetPrivate->extra->inRenderWithPainter; } else { useSystemClip = true; diff --git a/src/opengl/qpaintengine_opengl.cpp b/src/opengl/qpaintengine_opengl.cpp index 9da811a9d0..dffda118c5 100644 --- a/src/opengl/qpaintengine_opengl.cpp +++ b/src/opengl/qpaintengine_opengl.cpp @@ -2358,8 +2358,8 @@ void QOpenGLPaintEngine::updateClipRegion(const QRegion &clipRegion, Qt::ClipOpe } else { #ifndef Q_WS_QWS // Only use the system clip if we're currently rendering a widget with a GL painter. - if (d->currentClipWidget) { - QWidgetPrivate *widgetPrivate = qt_widget_private(d->currentClipWidget->window()); + if (d->currentClipDevice) { + QWidgetPrivate *widgetPrivate = qt_widget_private(static_cast<QWidget *>(d->currentClipDevice)->window()); d->use_system_clip = widgetPrivate->extra && widgetPrivate->extra->inRenderWithPainter; } #endif |