1 files changed, 15 insertions, 16 deletions
diff --git a/src/plugins/platforms/windows/qwindowsglcontext.h b/src/plugins/platforms/windows/qwindowsglcontext.h
index 4c804a612e..23d2fd0d09 100644
--- a/src/plugins/platforms/windows/qwindowsglcontext.h
+++ b/src/plugins/platforms/windows/qwindowsglcontext.h
@@ -72,24 +72,23 @@ struct QWindowsOpenGLAdditionalFormat
 struct QOpenGLContextData
 {
     QOpenGLContextData(HGLRC r, HWND h, HDC d) : renderingContext(r), hwnd(h), hdc(d) {}
-    QOpenGLContextData() : renderingContext(0), hwnd(0), hdc(0) {}
+    QOpenGLContextData() {}
 
-    HGLRC renderingContext;
-    HWND hwnd;
-    HDC hdc;
+    HGLRC renderingContext = 0;
+    HWND hwnd = 0;
+    HDC hdc = 0;
 };
 
 class QOpenGLStaticContext;
 
 struct QWindowsOpenGLContextFormat
 {
-    QWindowsOpenGLContextFormat();
     static QWindowsOpenGLContextFormat current();
     void apply(QSurfaceFormat *format) const;
 
-    QSurfaceFormat::OpenGLContextProfile profile;
-    int version; //! majorVersion<<8 + minorVersion
-    QSurfaceFormat::FormatOptions options;
+    QSurfaceFormat::OpenGLContextProfile profile = QSurfaceFormat::NoProfile;
+    int version = 0; //! majorVersion<<8 + minorVersion
+    QSurfaceFormat::FormatOptions options = 0;
 };
 
 #ifndef QT_NO_DEBUG_STREAM
@@ -194,22 +193,22 @@ class QWindowsGLContext : public QWindowsOpenGLContext
 public:
     explicit QWindowsGLContext(QOpenGLStaticContext *staticContext, QOpenGLContext *context);
     ~QWindowsGLContext();
-    bool isSharing() const Q_DECL_OVERRIDE { return m_context->shareHandle(); }
-    bool isValid() const Q_DECL_OVERRIDE { return m_renderingContext && !m_lost; }
-    QSurfaceFormat format() const Q_DECL_OVERRIDE { return m_obtainedFormat; }
+    bool isSharing() const override { return m_context->shareHandle(); }
+    bool isValid() const override { return m_renderingContext && !m_lost; }
+    QSurfaceFormat format() const override { return m_obtainedFormat; }
 
-    void swapBuffers(QPlatformSurface *surface) Q_DECL_OVERRIDE;
+    void swapBuffers(QPlatformSurface *surface) override;
 
-    bool makeCurrent(QPlatformSurface *surface) Q_DECL_OVERRIDE;
-    void doneCurrent() Q_DECL_OVERRIDE;
+    bool makeCurrent(QPlatformSurface *surface) override;
+    void doneCurrent() override;
 
     typedef void (*GL_Proc) ();
 
-    QFunctionPointer getProcAddress(const char *procName) Q_DECL_OVERRIDE;
+    QFunctionPointer getProcAddress(const char *procName) override;
 
     HGLRC renderingContext() const { return m_renderingContext; }
 
-    void *nativeContext() const Q_DECL_OVERRIDE { return m_renderingContext; }
+    void *nativeContext() const override { return m_renderingContext; }
 
 private:
     inline void releaseDCs();