Make QEglFSBackingStore use QtGui-only APIs.

We now have better replacements for QGLPaintDevice etc.

Change-Id: I3ac563f0ac26a563b3c788d16c77e0237d9d96d9
Reviewed-by: Donald Carr <donald.carr@nokia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Reviewed-by: Andy Nichols <andy.nichols@nokia.com>

1 files changed, 11 insertions, 6 deletions

diff --git a/src/plugins/platforms/eglfs/qeglfsbackingstore.h b/src/plugins/platforms/eglfs/qeglfsbackingstore.h
index 1ae3ecdc61..1eb4d8d79a 100644
--- a/src/plugins/platforms/eglfs/qeglfsbackingstore.h
+++ b/src/plugins/platforms/eglfs/qeglfsbackingstore.h
@@ -42,25 +42,30 @@
 #ifndef QEGLWINDOWSURFACE_H
 #define QEGLWINDOWSURFACE_H
 
-#include "qeglfsintegration.h"
-#include "qeglfswindow.h"
-
 #include <QtGui/qplatformbackingstore_qpa.h>
 
 QT_BEGIN_NAMESPACE
 
+class QOpenGLContext;
+class QOpenGLPaintDevice;
+
 class QEglFSBackingStore : public QPlatformBackingStore
 {
 public:
     QEglFSBackingStore(QWindow *window);
-    ~QEglFSBackingStore() { delete m_paintDevice; }
+    ~QEglFSBackingStore();
+
+    QPaintDevice *paintDevice();
+
+    void beginPaint(const QRegion &);
+    void endPaint();
 
-    QPaintDevice *paintDevice() { return m_paintDevice; }
     void flush(QWindow *window, const QRegion &region, const QPoint &offset);
     void resize(const QSize &size, const QRegion &staticContents);
 
 private:
-    QPaintDevice *m_paintDevice;
+    QOpenGLContext *m_context;
+    QOpenGLPaintDevice *m_device;
 };
 
 QT_END_NAMESPACE