OpenGL API refactor.

Rename QGuiGLFormat to QSurfaceFormat, and make QWindow sub-class of
QSurface and QPlatformWindow sub-class of QPlatformSurface, instead of
having QPlatformGLSurface accessor in QWindow.

1 files changed, 3 insertions, 3 deletions

diff --git a/examples/opengl/hellowindow/hellowindow.h b/examples/opengl/hellowindow/hellowindow.h
index 274dc9ca17..3c5388cb76 100644
--- a/examples/opengl/hellowindow/hellowindow.h
+++ b/examples/opengl/hellowindow/hellowindow.h
@@ -12,9 +12,9 @@ class Renderer : public QObject
 public:
     Renderer();
 
-    QGuiGLFormat format() const;
+    QSurfaceFormat format() const;
 
-    void render(QPlatformGLSurface *surface, const QColor &color, const QSize &viewSize);
+    void render(QSurface *surface, const QColor &color, const QSize &viewSize);
 
 private:
     void initialize();
@@ -35,7 +35,7 @@ private:
     int colorUniform;
 
     bool m_initialized;
-    QGuiGLFormat m_format;
+    QSurfaceFormat m_format;
     QGuiGLContext *m_context;
 };