diff --git a/src/gui/opengl/qopenglfunctions_1_4.cpp b/src/gui/opengl/qopenglfunctions_1_4.cpp
index 5ff2c24014..4b78253301 100644
--- a/src/gui/opengl/qopenglfunctions_1_4.cpp
+++ b/src/gui/opengl/qopenglfunctions_1_4.cpp
@@ -82,36 +82,46 @@ QOpenGLFunctions_1_4::QOpenGLFunctions_1_4()
 
 QOpenGLFunctions_1_4::~QOpenGLFunctions_1_4()
 {
-    if (d_1_0_Core)
+    if (d_1_0_Core) {
         d_1_0_Core->refs.deref();
-    Q_ASSERT(d_1_0_Core->refs.load());
-    if (d_1_1_Core)
+        Q_ASSERT(d_1_0_Core->refs.load());
+    }
+    if (d_1_1_Core) {
         d_1_1_Core->refs.deref();
-    Q_ASSERT(d_1_1_Core->refs.load());
-    if (d_1_2_Core)
+        Q_ASSERT(d_1_1_Core->refs.load());
+    }
+    if (d_1_2_Core) {
         d_1_2_Core->refs.deref();
-    Q_ASSERT(d_1_2_Core->refs.load());
-    if (d_1_3_Core)
+        Q_ASSERT(d_1_2_Core->refs.load());
+    }
+    if (d_1_3_Core) {
         d_1_3_Core->refs.deref();
-    Q_ASSERT(d_1_3_Core->refs.load());
-    if (d_1_4_Core)
+        Q_ASSERT(d_1_3_Core->refs.load());
+    }
+    if (d_1_4_Core) {
         d_1_4_Core->refs.deref();
-    Q_ASSERT(d_1_4_Core->refs.load());
-    if (d_1_0_Deprecated)
+        Q_ASSERT(d_1_4_Core->refs.load());
+    }
+    if (d_1_0_Deprecated) {
         d_1_0_Deprecated->refs.deref();
-    Q_ASSERT(d_1_0_Deprecated->refs.load());
-    if (d_1_1_Deprecated)
+        Q_ASSERT(d_1_0_Deprecated->refs.load());
+    }
+    if (d_1_1_Deprecated) {
         d_1_1_Deprecated->refs.deref();
-    Q_ASSERT(d_1_1_Deprecated->refs.load());
-    if (d_1_2_Deprecated)
+        Q_ASSERT(d_1_1_Deprecated->refs.load());
+    }
+    if (d_1_2_Deprecated) {
         d_1_2_Deprecated->refs.deref();
-    Q_ASSERT(d_1_2_Deprecated->refs.load());
-    if (d_1_3_Deprecated)
+        Q_ASSERT(d_1_2_Deprecated->refs.load());
+    }
+    if (d_1_3_Deprecated) {
         d_1_3_Deprecated->refs.deref();
-    Q_ASSERT(d_1_3_Deprecated->refs.load());
-    if (d_1_4_Deprecated)
+        Q_ASSERT(d_1_3_Deprecated->refs.load());
+    }
+    if (d_1_4_Deprecated) {
         d_1_4_Deprecated->refs.deref();
-    Q_ASSERT(d_1_4_Deprecated->refs.load());
+        Q_ASSERT(d_1_4_Deprecated->refs.load());
+    }
 }
 
 bool QOpenGLFunctions_1_4::initializeOpenGLFunctions()
diff --git a/src/gui/opengl/qopenglfunctions_3_0.cpp b/src/gui/opengl/qopenglfunctions_3_0.cpp
index ee7f92855d..09e3ad09ef 100644
--- a/src/gui/opengl/qopenglfunctions_3_0.cpp
+++ b/src/gui/opengl/qopenglfunctions_3_0.cpp
@@ -88,48 +88,62 @@ QOpenGLFunctions_3_0::QOpenGLFunctions_3_0()
 
 QOpenGLFunctions_3_0::~QOpenGLFunctions_3_0()
 {
-    if (d_1_0_Core)
+    if (d_1_0_Core) {
         d_1_0_Core->refs.deref();
-    Q_ASSERT(d_1_0_Core->refs.load());
-    if (d_1_1_Core)
+        Q_ASSERT(d_1_0_Core->refs.load());
+    }
+    if (d_1_1_Core) {
         d_1_1_Core->refs.deref();
-    Q_ASSERT(d_1_1_Core->refs.load());
-    if (d_1_2_Core)
+        Q_ASSERT(d_1_1_Core->refs.load());
+    }
+    if (d_1_2_Core) {
         d_1_2_Core->refs.deref();
-    Q_ASSERT(d_1_2_Core->refs.load());
-    if (d_1_3_Core)
+        Q_ASSERT(d_1_2_Core->refs.load());
+    }
+    if (d_1_3_Core) {
         d_1_3_Core->refs.deref();
-    Q_ASSERT(d_1_3_Core->refs.load());
-    if (d_1_4_Core)
+        Q_ASSERT(d_1_3_Core->refs.load());
+    }
+    if (d_1_4_Core) {
         d_1_4_Core->refs.deref();
-    Q_ASSERT(d_1_4_Core->refs.load());
-    if (d_1_5_Core)
+        Q_ASSERT(d_1_4_Core->refs.load());
+    }
+    if (d_1_5_Core) {
         d_1_5_Core->refs.deref();
-    Q_ASSERT(d_1_5_Core->refs.load());
-    if (d_2_0_Core)
+        Q_ASSERT(d_1_5_Core->refs.load());
+    }
+    if (d_2_0_Core) {
         d_2_0_Core->refs.deref();
-    Q_ASSERT(d_2_0_Core->refs.load());
-    if (d_2_1_Core)
+        Q_ASSERT(d_2_0_Core->refs.load());
+    }
+    if (d_2_1_Core) {
         d_2_1_Core->refs.deref();
-    Q_ASSERT(d_2_1_Core->refs.load());
-    if (d_3_0_Core)
+        Q_ASSERT(d_2_1_Core->refs.load());
+    }
+    if (d_3_0_Core) {
         d_3_0_Core->refs.deref();
-    Q_ASSERT(d_3_0_Core->refs.load());
-    if (d_1_0_Deprecated)
+        Q_ASSERT(d_3_0_Core->refs.load());
+    }
+    if (d_1_0_Deprecated) {
         d_1_0_Deprecated->refs.deref();
-    Q_ASSERT(d_1_0_Deprecated->refs.load());
-    if (d_1_1_Deprecated)
+        Q_ASSERT(d_1_0_Deprecated->refs.load());
+    }
+    if (d_1_1_Deprecated) {
         d_1_1_Deprecated->refs.deref();
-    Q_ASSERT(d_1_1_Deprecated->refs.load());
-    if (d_1_2_Deprecated)
+        Q_ASSERT(d_1_1_Deprecated->refs.load());
+    }
+    if (d_1_2_Deprecated) {
         d_1_2_Deprecated->refs.deref();
-    Q_ASSERT(d_1_2_Deprecated->refs.load());
-    if (d_1_3_Deprecated)
+        Q_ASSERT(d_1_2_Deprecated->refs.load());
+    }
+    if (d_1_3_Deprecated) {
         d_1_3_Deprecated->refs.deref();
-    Q_ASSERT(d_1_3_Deprecated->refs.load());
-    if (d_1_4_Deprecated)
+        Q_ASSERT(d_1_3_Deprecated->refs.load());
+    }
+    if (d_1_4_Deprecated) {
         d_1_4_Deprecated->refs.deref();
-    Q_ASSERT(d_1_4_Deprecated->refs.load());
+        Q_ASSERT(d_1_4_Deprecated->refs.load());
+    }
 }
 
 bool QOpenGLFunctions_3_0::initializeOpenGLFunctions()