From 0ead3b7142e47b89059af689de4ede47075375be Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Wed, 11 Jul 2018 15:12:56 +0200
Subject: Move arthurwidget based examples to new QOpenGL classes

Several of the examples were not even working besides using deprecated
classes.

Change-Id: I352e0629d490593edcc5868d2ec5a8ff222eaeab
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
---
 examples/widgets/painting/composition/composition.h | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'examples/widgets/painting/composition/composition.h')

diff --git a/examples/widgets/painting/composition/composition.h b/examples/widgets/painting/composition/composition.h
index 49853f503b..19150e2024 100644
--- a/examples/widgets/painting/composition/composition.h
+++ b/examples/widgets/painting/composition/composition.h
@@ -53,6 +53,11 @@
 
 #include "arthurwidgets.h"
 
+#if QT_CONFIG(opengl)
+#include "fbopaintdevice.h"
+#include <QOpenGLTextureBlitter>
+#endif
+
 #include <QPainter>
 #include <QEvent>
 
@@ -61,10 +66,6 @@ class QPushButton;
 class QRadioButton;
 QT_END_NAMESPACE
 
-#ifdef QT_OPENGL_SUPPORT
-#include <QtOpenGL>
-#endif
-
 class CompositionWidget : public QWidget
 {
     Q_OBJECT
@@ -186,12 +187,13 @@ private:
     bool m_animation_enabled;
     int m_animationTimer;
 
-#ifdef QT_OPENGL_SUPPORT
-    QGLPixelBuffer *m_pbuffer;
-    GLuint m_base_tex;
-    GLuint m_compositing_tex;
+#if QT_CONFIG(opengl)
+    QScopedPointer<QFboPaintDevice> m_fbo;
     int m_pbuffer_size; // width==height==size of pbuffer
+    uint m_base_tex;
+    uint m_compositing_tex;
     QSize m_previous_size;
+    QOpenGLTextureBlitter m_blitter;
 #endif
 };
 
-- 
cgit v1.2.3