diff options
Diffstat (limited to 'src/opengl/gl2paintengineex')
| -rw-r--r-- | src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 5 | ||||
| -rw-r--r-- | src/opengl/gl2paintengineex/qtriangulator.cpp | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp index d2c63ddc10..58b9002222 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp @@ -76,7 +76,6 @@ #include <QPaintEngine> #include <private/qpainter_p.h> #include <private/qfontengine_p.h> -#include <private/qpixmapdata_gl_p.h> #include <private/qdatabuffer_p.h> #include <private/qstatictext_p.h> #include <private/qtriangulator_p.h> @@ -2335,8 +2334,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/gl2paintengineex/qtriangulator.cpp b/src/opengl/gl2paintengineex/qtriangulator.cpp index d4b7131794..fb57f97127 100644 --- a/src/opengl/gl2paintengineex/qtriangulator.cpp +++ b/src/opengl/gl2paintengineex/qtriangulator.cpp @@ -41,7 +41,7 @@ #include "qtriangulator_p.h" -#include <QtGui/qdialog.h> +#include <QtWidgets/qdialog.h> #include <QtGui/qevent.h> #include <QtGui/qpainter.h> #include <QtGui/qpainterpath.h> |