Avoid nullptr deref in Q_ASSERTS

Found by Coverity, CIDs: [159014-159383]. Indeed, Q_ASSERTS can
go into the block controlled by the corresponding if-statements,
otherwise - why 'if' at all?

Change-Id: Ibc99cd48b97287ec132e082d14f3c39350d547f9
Reviewed-by: Lars Knoll <[email protected]>

24 files changed, 1038 insertions, 692 deletions

diff --git a/src/gui/opengl/qopenglfunctions_1_0.cpp b/src/gui/opengl/qopenglfunctions_1_0.cpp
index 9d5a76380ad..4235c9a3394 100644
--- a/src/gui/opengl/qopenglfunctions_1_0.cpp
+++ b/src/gui/opengl/qopenglfunctions_1_0.cpp
@@ -74,12 +74,14 @@ QOpenGLFunctions_1_0::QOpenGLFunctions_1_0()
 
 QOpenGLFunctions_1_0::~QOpenGLFunctions_1_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_0_Deprecated)
+        Q_ASSERT(d_1_0_Core->refs.load());
+    }
+    if (d_1_0_Deprecated) {
         d_1_0_Deprecated->refs.deref();
-    Q_ASSERT(d_1_0_Deprecated->refs.load());
+        Q_ASSERT(d_1_0_Deprecated->refs.load());
+    }
 }
 
 bool QOpenGLFunctions_1_0::initializeOpenGLFunctions()
diff --git a/src/gui/opengl/qopenglfunctions_1_1.cpp b/src/gui/opengl/qopenglfunctions_1_1.cpp
index 57385f19279..7d09bb40c18 100644
--- a/src/gui/opengl/qopenglfunctions_1_1.cpp
+++ b/src/gui/opengl/qopenglfunctions_1_1.cpp
@@ -76,18 +76,22 @@ QOpenGLFunctions_1_1::QOpenGLFunctions_1_1()
 
 QOpenGLFunctions_1_1::~QOpenGLFunctions_1_1()
 {
-    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_0_Deprecated)
+        Q_ASSERT(d_1_1_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());
+        Q_ASSERT(d_1_1_Deprecated->refs.load());
+    }
 }
 
 bool QOpenGLFunctions_1_1::initializeOpenGLFunctions()
diff --git a/src/gui/opengl/qopenglfunctions_1_2.cpp b/src/gui/opengl/qopenglfunctions_1_2.cpp
index 9eaa13862d2..94a9d64660a 100644
--- a/src/gui/opengl/qopenglfunctions_1_2.cpp
+++ b/src/gui/opengl/qopenglfunctions_1_2.cpp
@@ -78,24 +78,30 @@ QOpenGLFunctions_1_2::QOpenGLFunctions_1_2()
 
 QOpenGLFunctions_1_2::~QOpenGLFunctions_1_2()
 {
-    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_0_Deprecated)
+        Q_ASSERT(d_1_2_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());
+        Q_ASSERT(d_1_2_Deprecated->refs.load());
+    }
 }
 
 bool QOpenGLFunctions_1_2::initializeOpenGLFunctions()
diff --git a/src/gui/opengl/qopenglfunctions_1_3.cpp b/src/gui/opengl/qopenglfunctions_1_3.cpp
index 62119973029..972ef9ff70e 100644
--- a/src/gui/opengl/qopenglfunctions_1_3.cpp
+++ b/src/gui/opengl/qopenglfunctions_1_3.cpp
@@ -80,30 +80,38 @@ QOpenGLFunctions_1_3::QOpenGLFunctions_1_3()
 
 QOpenGLFunctions_1_3::~QOpenGLFunctions_1_3()
 {
-    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_0_Deprecated)
+        Q_ASSERT(d_1_3_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());
+        Q_ASSERT(d_1_3_Deprecated->refs.load());
+    }
 }
 
 bool QOpenGLFunctions_1_3::initializeOpenGLFunctions()
diff --git a/src/gui/opengl/qopenglfunctions_1_5.cpp b/src/gui/opengl/qopenglfunctions_1_5.cpp
index d07f1decec7..2a0820d0cbd 100644
--- a/src/gui/opengl/qopenglfunctions_1_5.cpp
+++ b/src/gui/opengl/qopenglfunctions_1_5.cpp
@@ -83,39 +83,50 @@ QOpenGLFunctions_1_5::QOpenGLFunctions_1_5()
 
 QOpenGLFunctions_1_5::~QOpenGLFunctions_1_5()
 {
-    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_1_0_Deprecated)
+        Q_ASSERT(d_1_5_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_5::initializeOpenGLFunctions()
diff --git a/src/gui/opengl/qopenglfunctions_2_0.cpp b/src/gui/opengl/qopenglfunctions_2_0.cpp
index b7dc8ef4588..c175b13c5b0 100644
--- a/src/gui/opengl/qopenglfunctions_2_0.cpp
+++ b/src/gui/opengl/qopenglfunctions_2_0.cpp
@@ -85,42 +85,54 @@ QOpenGLFunctions_2_0::QOpenGLFunctions_2_0()
 
 QOpenGLFunctions_2_0::~QOpenGLFunctions_2_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_1_0_Deprecated)
+        Q_ASSERT(d_2_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_2_0::initializeOpenGLFunctions()
diff --git a/src/gui/opengl/qopenglfunctions_2_1.cpp b/src/gui/opengl/qopenglfunctions_2_1.cpp
index e756685d10b..4e77efd1218 100644
--- a/src/gui/opengl/qopenglfunctions_2_1.cpp
+++ b/src/gui/opengl/qopenglfunctions_2_1.cpp
@@ -86,45 +86,58 @@ QOpenGLFunctions_2_1::QOpenGLFunctions_2_1()
 
 QOpenGLFunctions_2_1::~QOpenGLFunctions_2_1()
 {
-    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_1_0_Deprecated)
+        Q_ASSERT(d_2_1_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_2_1::initializeOpenGLFunctions()
diff --git a/src/gui/opengl/qopenglfunctions_3_1.cpp b/src/gui/opengl/qopenglfunctions_3_1.cpp
index a459ddf2442..9328f5ca892 100644
--- a/src/gui/opengl/qopenglfunctions_3_1.cpp
+++ b/src/gui/opengl/qopenglfunctions_3_1.cpp
@@ -82,36 +82,46 @@ QOpenGLFunctions_3_1::QOpenGLFunctions_3_1()
 
 QOpenGLFunctions_3_1::~QOpenGLFunctions_3_1()
 {
-    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_3_1_Core)
+        Q_ASSERT(d_3_0_Core->refs.load());
+    }
+    if (d_3_1_Core) {
         d_3_1_Core->refs.deref();
-    Q_ASSERT(d_3_1_Core->refs.load());
+        Q_ASSERT(d_3_1_Core->refs.load());
+    }
 }
 
 bool QOpenGLFunctions_3_1::initializeOpenGLFunctions()
diff --git a/src/gui/opengl/qopenglfunctions_3_2_compatibility.cpp b/src/gui/opengl/qopenglfunctions_3_2_compatibility.cpp
index 09402db09ad..b90a123bfe8 100644
--- a/src/gui/opengl/qopenglfunctions_3_2_compatibility.cpp
+++ b/src/gui/opengl/qopenglfunctions_3_2_compatibility.cpp
@@ -90,54 +90,70 @@ QOpenGLFunctions_3_2_Compatibility::QOpenGLFunctions_3_2_Compatibility()
 
 QOpenGLFunctions_3_2_Compatibility::~QOpenGLFunctions_3_2_Compatibility()
 {
-    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_3_1_Core)
+        Q_ASSERT(d_3_0_Core->refs.load());
+    }
+    if (d_3_1_Core) {
         d_3_1_Core->refs.deref();
-    Q_ASSERT(d_3_1_Core->refs.load());
-    if (d_3_2_Core)
+        Q_ASSERT(d_3_1_Core->refs.load());
+    }
+    if (d_3_2_Core) {
         d_3_2_Core->refs.deref();
-    Q_ASSERT(d_3_2_Core->refs.load());
-    if (d_1_0_Deprecated)
+        Q_ASSERT(d_3_2_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_2_Compatibility::initializeOpenGLFunctions()
diff --git a/src/gui/opengl/qopenglfunctions_3_2_core.cpp b/src/gui/opengl/qopenglfunctions_3_2_core.cpp
index 177dc9e25d2..02c0c78b012 100644
--- a/src/gui/opengl/qopenglfunctions_3_2_core.cpp
+++ b/src/gui/opengl/qopenglfunctions_3_2_core.cpp
@@ -83,39 +83,50 @@ QOpenGLFunctions_3_2_Core::QOpenGLFunctions_3_2_Core()
 
 QOpenGLFunctions_3_2_Core::~QOpenGLFunctions_3_2_Core()
 {
-    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_3_1_Core)
+        Q_ASSERT(d_3_0_Core->refs.load());
+    }
+    if (d_3_1_Core) {
         d_3_1_Core->refs.deref();
-    Q_ASSERT(d_3_1_Core->refs.load());
-    if (d_3_2_Core)
+        Q_ASSERT(d_3_1_Core->refs.load());
+    }
+    if (d_3_2_Core) {
         d_3_2_Core->refs.deref();
-    Q_ASSERT(d_3_2_Core->refs.load());
+        Q_ASSERT(d_3_2_Core->refs.load());
+    }
 }
 
 bool QOpenGLFunctions_3_2_Core::initializeOpenGLFunctions()
diff --git a/src/gui/opengl/qopenglfunctions_3_3_compatibility.cpp b/src/gui/opengl/qopenglfunctions_3_3_compatibility.cpp
index 110a49ea53b..c585f0fc7c5 100644
--- a/src/gui/opengl/qopenglfunctions_3_3_compatibility.cpp
+++ b/src/gui/opengl/qopenglfunctions_3_3_compatibility.cpp
@@ -91,60 +91,78 @@ QOpenGLFunctions_3_3_Compatibility::QOpenGLFunctions_3_3_Compatibility()
 
 QOpenGLFunctions_3_3_Compatibility::~QOpenGLFunctions_3_3_Compatibility()
 {
-    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_3_1_Core)
+        Q_ASSERT(d_3_0_Core->refs.load());
+    }
+    if (d_3_1_Core) {
         d_3_1_Core->refs.deref();
-    Q_ASSERT(d_3_1_Core->refs.load());
-    if (d_3_2_Core)
+        Q_ASSERT(d_3_1_Core->refs.load());
+    }
+    if (d_3_2_Core) {
         d_3_2_Core->refs.deref();
-    Q_ASSERT(d_3_2_Core->refs.load());
-    if (d_3_3_Core)
+        Q_ASSERT(d_3_2_Core->refs.load());
+    }
+    if (d_3_3_Core) {
         d_3_3_Core->refs.deref();
-    Q_ASSERT(d_3_3_Core->refs.load());
-    if (d_1_0_Deprecated)
+        Q_ASSERT(d_3_3_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());
-    if (d_3_3_Deprecated)
+        Q_ASSERT(d_1_4_Deprecated->refs.load());
+    }
+    if (d_3_3_Deprecated) {
         d_3_3_Deprecated->refs.deref();
-    Q_ASSERT(d_3_3_Deprecated->refs.load());
+        Q_ASSERT(d_3_3_Deprecated->refs.load());
+    }
 }
 
 bool QOpenGLFunctions_3_3_Compatibility::initializeOpenGLFunctions()
diff --git a/src/gui/opengl/qopenglfunctions_3_3_core.cpp b/src/gui/opengl/qopenglfunctions_3_3_core.cpp
index 2e706724d91..7779d92b6ad 100644
--- a/src/gui/opengl/qopenglfunctions_3_3_core.cpp
+++ b/src/gui/opengl/qopenglfunctions_3_3_core.cpp
@@ -84,42 +84,54 @@ QOpenGLFunctions_3_3_Core::QOpenGLFunctions_3_3_Core()
 
 QOpenGLFunctions_3_3_Core::~QOpenGLFunctions_3_3_Core()
 {
-    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_3_1_Core)
+        Q_ASSERT(d_3_0_Core->refs.load());
+    }
+    if (d_3_1_Core) {
         d_3_1_Core->refs.deref();
-    Q_ASSERT(d_3_1_Core->refs.load());
-    if (d_3_2_Core)
+        Q_ASSERT(d_3_1_Core->refs.load());
+    }
+    if (d_3_2_Core) {
         d_3_2_Core->refs.deref();
-    Q_ASSERT(d_3_2_Core->refs.load());
-    if (d_3_3_Core)
+        Q_ASSERT(d_3_2_Core->refs.load());
+    }
+    if (d_3_3_Core) {
         d_3_3_Core->refs.deref();
-    Q_ASSERT(d_3_3_Core->refs.load());
+        Q_ASSERT(d_3_3_Core->refs.load());
+    }
 }
 
 bool QOpenGLFunctions_3_3_Core::initializeOpenGLFunctions()
diff --git a/src/gui/opengl/qopenglfunctions_4_0_compatibility.cpp b/src/gui/opengl/qopenglfunctions_4_0_compatibility.cpp
index 14fb168c94a..b5c423ef0ca 100644
--- a/src/gui/opengl/qopenglfunctions_4_0_compatibility.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_0_compatibility.cpp
@@ -92,63 +92,82 @@ QOpenGLFunctions_4_0_Compatibility::QOpenGLFunctions_4_0_Compatibility()
 
 QOpenGLFunctions_4_0_Compatibility::~QOpenGLFunctions_4_0_Compatibility()
 {
-    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_3_1_Core)
+        Q_ASSERT(d_3_0_Core->refs.load());
+    }
+    if (d_3_1_Core) {
         d_3_1_Core->refs.deref();
-    Q_ASSERT(d_3_1_Core->refs.load());
-    if (d_3_2_Core)
+        Q_ASSERT(d_3_1_Core->refs.load());
+    }
+    if (d_3_2_Core) {
         d_3_2_Core->refs.deref();
-    Q_ASSERT(d_3_2_Core->refs.load());
-    if (d_3_3_Core)
+        Q_ASSERT(d_3_2_Core->refs.load());
+    }
+    if (d_3_3_Core) {
         d_3_3_Core->refs.deref();
-    Q_ASSERT(d_3_3_Core->refs.load());
-    if (d_4_0_Core)
+        Q_ASSERT(d_3_3_Core->refs.load());
+    }
+    if (d_4_0_Core) {
         d_4_0_Core->refs.deref();
-    Q_ASSERT(d_4_0_Core->refs.load());
-    if (d_1_0_Deprecated)
+        Q_ASSERT(d_4_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());
-    if (d_3_3_Deprecated)
+        Q_ASSERT(d_1_4_Deprecated->refs.load());
+    }
+    if (d_3_3_Deprecated) {
         d_3_3_Deprecated->refs.deref();
-    Q_ASSERT(d_3_3_Deprecated->refs.load());
+        Q_ASSERT(d_3_3_Deprecated->refs.load());
+    }
 }
 
 bool QOpenGLFunctions_4_0_Compatibility::initializeOpenGLFunctions()
diff --git a/src/gui/opengl/qopenglfunctions_4_0_core.cpp b/src/gui/opengl/qopenglfunctions_4_0_core.cpp
index 6dc94153c82..4e4e8cc5471 100644
--- a/src/gui/opengl/qopenglfunctions_4_0_core.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_0_core.cpp
@@ -85,45 +85,58 @@ QOpenGLFunctions_4_0_Core::QOpenGLFunctions_4_0_Core()
 
 QOpenGLFunctions_4_0_Core::~QOpenGLFunctions_4_0_Core()
 {
-    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_3_1_Core)
+        Q_ASSERT(d_3_0_Core->refs.load());
+    }
+    if (d_3_1_Core) {
         d_3_1_Core->refs.deref();
-    Q_ASSERT(d_3_1_Core->refs.load());
-    if (d_3_2_Core)
+        Q_ASSERT(d_3_1_Core->refs.load());
+    }
+    if (d_3_2_Core) {
         d_3_2_Core->refs.deref();
-    Q_ASSERT(d_3_2_Core->refs.load());
-    if (d_3_3_Core)
+        Q_ASSERT(d_3_2_Core->refs.load());
+    }
+    if (d_3_3_Core) {
         d_3_3_Core->refs.deref();
-    Q_ASSERT(d_3_3_Core->refs.load());
-    if (d_4_0_Core)
+        Q_ASSERT(d_3_3_Core->refs.load());
+    }
+    if (d_4_0_Core) {
         d_4_0_Core->refs.deref();
-    Q_ASSERT(d_4_0_Core->refs.load());
+        Q_ASSERT(d_4_0_Core->refs.load());
+    }
 }
 
 bool QOpenGLFunctions_4_0_Core::initializeOpenGLFunctions()
diff --git a/src/gui/opengl/qopenglfunctions_4_1_compatibility.cpp b/src/gui/opengl/qopenglfunctions_4_1_compatibility.cpp
index 293409ddef1..72c60c74b71 100644
--- a/src/gui/opengl/qopenglfunctions_4_1_compatibility.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_1_compatibility.cpp
@@ -93,66 +93,86 @@ QOpenGLFunctions_4_1_Compatibility::QOpenGLFunctions_4_1_Compatibility()
 
 QOpenGLFunctions_4_1_Compatibility::~QOpenGLFunctions_4_1_Compatibility()
 {
-    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_3_1_Core)
+        Q_ASSERT(d_3_0_Core->refs.load());
+    }
+    if (d_3_1_Core) {
         d_3_1_Core->refs.deref();
-    Q_ASSERT(d_3_1_Core->refs.load());
-    if (d_3_2_Core)
+        Q_ASSERT(d_3_1_Core->refs.load());
+    }
+    if (d_3_2_Core) {
         d_3_2_Core->refs.deref();
-    Q_ASSERT(d_3_2_Core->refs.load());
-    if (d_3_3_Core)
+        Q_ASSERT(d_3_2_Core->refs.load());
+    }
+    if (d_3_3_Core) {
         d_3_3_Core->refs.deref();
-    Q_ASSERT(d_3_3_Core->refs.load());
-    if (d_4_0_Core)
+        Q_ASSERT(d_3_3_Core->refs.load());
+    }
+    if (d_4_0_Core) {
         d_4_0_Core->refs.deref();
-    Q_ASSERT(d_4_0_Core->refs.load());
-    if (d_4_1_Core)
+        Q_ASSERT(d_4_0_Core->refs.load());
+    }
+    if (d_4_1_Core) {
         d_4_1_Core->refs.deref();
-    Q_ASSERT(d_4_1_Core->refs.load());
-    if (d_1_0_Deprecated)
+        Q_ASSERT(d_4_1_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());
-    if (d_3_3_Deprecated)
+        Q_ASSERT(d_1_4_Deprecated->refs.load());
+    }
+    if (d_3_3_Deprecated) {
         d_3_3_Deprecated->refs.deref();
-    Q_ASSERT(d_3_3_Deprecated->refs.load());
+        Q_ASSERT(d_3_3_Deprecated->refs.load());
+    }
 }
 
 bool QOpenGLFunctions_4_1_Compatibility::initializeOpenGLFunctions()
diff --git a/src/gui/opengl/qopenglfunctions_4_1_core.cpp b/src/gui/opengl/qopenglfunctions_4_1_core.cpp
index ff3d191781d..5a1e1eb42f2 100644
--- a/src/gui/opengl/qopenglfunctions_4_1_core.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_1_core.cpp
@@ -86,48 +86,62 @@ QOpenGLFunctions_4_1_Core::QOpenGLFunctions_4_1_Core()
 
 QOpenGLFunctions_4_1_Core::~QOpenGLFunctions_4_1_Core()
 {
-    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_3_1_Core)
+        Q_ASSERT(d_3_0_Core->refs.load());
+    }
+    if (d_3_1_Core) {
         d_3_1_Core->refs.deref();
-    Q_ASSERT(d_3_1_Core->refs.load());
-    if (d_3_2_Core)
+        Q_ASSERT(d_3_1_Core->refs.load());
+    }
+    if (d_3_2_Core) {
         d_3_2_Core->refs.deref();
-    Q_ASSERT(d_3_2_Core->refs.load());
-    if (d_3_3_Core)
+        Q_ASSERT(d_3_2_Core->refs.load());
+    }
+    if (d_3_3_Core) {
         d_3_3_Core->refs.deref();
-    Q_ASSERT(d_3_3_Core->refs.load());
-    if (d_4_0_Core)
+        Q_ASSERT(d_3_3_Core->refs.load());
+    }
+    if (d_4_0_Core) {
         d_4_0_Core->refs.deref();
-    Q_ASSERT(d_4_0_Core->refs.load());
-    if (d_4_1_Core)
+        Q_ASSERT(d_4_0_Core->refs.load());
+    }
+    if (d_4_1_Core) {
         d_4_1_Core->refs.deref();
-    Q_ASSERT(d_4_1_Core->refs.load());
+        Q_ASSERT(d_4_1_Core->refs.load());
+    }
 }
 
 bool QOpenGLFunctions_4_1_Core::initializeOpenGLFunctions()
diff --git a/src/gui/opengl/qopenglfunctions_4_2_compatibility.cpp b/src/gui/opengl/qopenglfunctions_4_2_compatibility.cpp
index 58527e92b52..8398ef0948b 100644
--- a/src/gui/opengl/qopenglfunctions_4_2_compatibility.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_2_compatibility.cpp
@@ -94,69 +94,90 @@ QOpenGLFunctions_4_2_Compatibility::QOpenGLFunctions_4_2_Compatibility()
 
 QOpenGLFunctions_4_2_Compatibility::~QOpenGLFunctions_4_2_Compatibility()
 {
-    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_3_1_Core)
+        Q_ASSERT(d_3_0_Core->refs.load());
+    }
+    if (d_3_1_Core) {
         d_3_1_Core->refs.deref();
-    Q_ASSERT(d_3_1_Core->refs.load());
-    if (d_3_2_Core)
+        Q_ASSERT(d_3_1_Core->refs.load());
+    }
+    if (d_3_2_Core) {
         d_3_2_Core->refs.deref();
-    Q_ASSERT(d_3_2_Core->refs.load());
-    if (d_3_3_Core)
+        Q_ASSERT(d_3_2_Core->refs.load());
+    }
+    if (d_3_3_Core) {
         d_3_3_Core->refs.deref();
-    Q_ASSERT(d_3_3_Core->refs.load());
-    if (d_4_0_Core)
+        Q_ASSERT(d_3_3_Core->refs.load());
+    }
+    if (d_4_0_Core) {
         d_4_0_Core->refs.deref();
-    Q_ASSERT(d_4_0_Core->refs.load());
-    if (d_4_1_Core)
+        Q_ASSERT(d_4_0_Core->refs.load());
+    }
+    if (d_4_1_Core) {
         d_4_1_Core->refs.deref();
-    Q_ASSERT(d_4_1_Core->refs.load());
-    if (d_4_2_Core)
+        Q_ASSERT(d_4_1_Core->refs.load());
+    }
+    if (d_4_2_Core) {
         d_4_2_Core->refs.deref();
-    Q_ASSERT(d_4_2_Core->refs.load());
-    if (d_1_0_Deprecated)
+        Q_ASSERT(d_4_2_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());
-    if (d_3_3_Deprecated)
+        Q_ASSERT(d_1_4_Deprecated->refs.load());
+    }
+    if (d_3_3_Deprecated) {
         d_3_3_Deprecated->refs.deref();
-    Q_ASSERT(d_3_3_Deprecated->refs.load());
+        Q_ASSERT(d_3_3_Deprecated->refs.load());
+    }
 }
 
 bool QOpenGLFunctions_4_2_Compatibility::initializeOpenGLFunctions()
diff --git a/src/gui/opengl/qopenglfunctions_4_2_core.cpp b/src/gui/opengl/qopenglfunctions_4_2_core.cpp
index b929abcf6a5..fdfb4db4557 100644
--- a/src/gui/opengl/qopenglfunctions_4_2_core.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_2_core.cpp
@@ -87,51 +87,66 @@ QOpenGLFunctions_4_2_Core::QOpenGLFunctions_4_2_Core()
 
 QOpenGLFunctions_4_2_Core::~QOpenGLFunctions_4_2_Core()
 {
-    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_3_1_Core)
+        Q_ASSERT(d_3_0_Core->refs.load());
+    }
+    if (d_3_1_Core) {
         d_3_1_Core->refs.deref();
-    Q_ASSERT(d_3_1_Core->refs.load());
-    if (d_3_2_Core)
+        Q_ASSERT(d_3_1_Core->refs.load());
+    }
+    if (d_3_2_Core) {
         d_3_2_Core->refs.deref();
-    Q_ASSERT(d_3_2_Core->refs.load());
-    if (d_3_3_Core)
+        Q_ASSERT(d_3_2_Core->refs.load());
+    }
+    if (d_3_3_Core) {
         d_3_3_Core->refs.deref();
-    Q_ASSERT(d_3_3_Core->refs.load());
-    if (d_4_0_Core)
+        Q_ASSERT(d_3_3_Core->refs.load());
+    }
+    if (d_4_0_Core) {
         d_4_0_Core->refs.deref();
-    Q_ASSERT(d_4_0_Core->refs.load());
-    if (d_4_1_Core)
+        Q_ASSERT(d_4_0_Core->refs.load());
+    }
+    if (d_4_1_Core) {
         d_4_1_Core->refs.deref();
-    Q_ASSERT(d_4_1_Core->refs.load());
-    if (d_4_2_Core)
+        Q_ASSERT(d_4_1_Core->refs.load());
+    }
+    if (d_4_2_Core) {
         d_4_2_Core->refs.deref();
-    Q_ASSERT(d_4_2_Core->refs.load());
+        Q_ASSERT(d_4_2_Core->refs.load());
+    }
 }
 
 bool QOpenGLFunctions_4_2_Core::initializeOpenGLFunctions()
diff --git a/src/gui/opengl/qopenglfunctions_4_3_compatibility.cpp b/src/gui/opengl/qopenglfunctions_4_3_compatibility.cpp
index a9f15083adf..19e67c63315 100644
--- a/src/gui/opengl/qopenglfunctions_4_3_compatibility.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_3_compatibility.cpp
@@ -95,72 +95,94 @@ QOpenGLFunctions_4_3_Compatibility::QOpenGLFunctions_4_3_Compatibility()
 
 QOpenGLFunctions_4_3_Compatibility::~QOpenGLFunctions_4_3_Compatibility()
 {
-    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_3_1_Core)
+        Q_ASSERT(d_3_0_Core->refs.load());
+    }
+    if (d_3_1_Core) {
         d_3_1_Core->refs.deref();
-    Q_ASSERT(d_3_1_Core->refs.load());
-    if (d_3_2_Core)
+        Q_ASSERT(d_3_1_Core->refs.load());
+    }
+    if (d_3_2_Core) {
         d_3_2_Core->refs.deref();
-    Q_ASSERT(d_3_2_Core->refs.load());
-    if (d_3_3_Core)
+        Q_ASSERT(d_3_2_Core->refs.load());
+    }
+    if (d_3_3_Core) {
         d_3_3_Core->refs.deref();
-    Q_ASSERT(d_3_3_Core->refs.load());
-    if (d_4_0_Core)
+        Q_ASSERT(d_3_3_Core->refs.load());
+    }
+    if (d_4_0_Core) {
         d_4_0_Core->refs.deref();
-    Q_ASSERT(d_4_0_Core->refs.load());
-    if (d_4_1_Core)
+        Q_ASSERT(d_4_0_Core->refs.load());
+    }
+    if (d_4_1_Core) {
         d_4_1_Core->refs.deref();
-    Q_ASSERT(d_4_1_Core->refs.load());
-    if (d_4_2_Core)
+        Q_ASSERT(d_4_1_Core->refs.load());
+    }
+    if (d_4_2_Core) {
         d_4_2_Core->refs.deref();
-    Q_ASSERT(d_4_2_Core->refs.load());
-    if (d_4_3_Core)
+        Q_ASSERT(d_4_2_Core->refs.load());
+    }
+    if (d_4_3_Core) {
         d_4_3_Core->refs.deref();
-    Q_ASSERT(d_4_3_Core->refs.load());
-    if (d_1_0_Deprecated)
+        Q_ASSERT(d_4_3_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());
-    if (d_3_3_Deprecated)
+        Q_ASSERT(d_1_4_Deprecated->refs.load());
+    }
+    if (d_3_3_Deprecated) {
         d_3_3_Deprecated->refs.deref();
-    Q_ASSERT(d_3_3_Deprecated->refs.load());
+        Q_ASSERT(d_3_3_Deprecated->refs.load());
+    }
 }
 
 bool QOpenGLFunctions_4_3_Compatibility::initializeOpenGLFunctions()
diff --git a/src/gui/opengl/qopenglfunctions_4_3_core.cpp b/src/gui/opengl/qopenglfunctions_4_3_core.cpp
index d3f988ba0de..95e2d7bc43a 100644
--- a/src/gui/opengl/qopenglfunctions_4_3_core.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_3_core.cpp
@@ -88,54 +88,70 @@ QOpenGLFunctions_4_3_Core::QOpenGLFunctions_4_3_Core()
 
 QOpenGLFunctions_4_3_Core::~QOpenGLFunctions_4_3_Core()
 {
-    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_3_1_Core)
+        Q_ASSERT(d_3_0_Core->refs.load());
+    }
+    if (d_3_1_Core) {
         d_3_1_Core->refs.deref();
-    Q_ASSERT(d_3_1_Core->refs.load());
-    if (d_3_2_Core)
+        Q_ASSERT(d_3_1_Core->refs.load());
+    }
+    if (d_3_2_Core) {
         d_3_2_Core->refs.deref();
-    Q_ASSERT(d_3_2_Core->refs.load());
-    if (d_3_3_Core)
+        Q_ASSERT(d_3_2_Core->refs.load());
+    }
+    if (d_3_3_Core) {
         d_3_3_Core->refs.deref();
-    Q_ASSERT(d_3_3_Core->refs.load());
-    if (d_4_0_Core)
+        Q_ASSERT(d_3_3_Core->refs.load());
+    }
+    if (d_4_0_Core) {
         d_4_0_Core->refs.deref();
-    Q_ASSERT(d_4_0_Core->refs.load());
-    if (d_4_1_Core)
+        Q_ASSERT(d_4_0_Core->refs.load());
+    }
+    if (d_4_1_Core) {
         d_4_1_Core->refs.deref();
-    Q_ASSERT(d_4_1_Core->refs.load());
-    if (d_4_2_Core)
+        Q_ASSERT(d_4_1_Core->refs.load());
+    }
+    if (d_4_2_Core) {
         d_4_2_Core->refs.deref();
-    Q_ASSERT(d_4_2_Core->refs.load());
-    if (d_4_3_Core)
+        Q_ASSERT(d_4_2_Core->refs.load());
+    }
+    if (d_4_3_Core) {
         d_4_3_Core->refs.deref();
-    Q_ASSERT(d_4_3_Core->refs.load());
+        Q_ASSERT(d_4_3_Core->refs.load());
+    }
 }
 
 bool QOpenGLFunctions_4_3_Core::initializeOpenGLFunctions()
diff --git a/src/gui/opengl/qopenglfunctions_4_4_compatibility.cpp b/src/gui/opengl/qopenglfunctions_4_4_compatibility.cpp
index 8cbb94c1a1a..a33efd0b950 100644
--- a/src/gui/opengl/qopenglfunctions_4_4_compatibility.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_4_compatibility.cpp
@@ -95,75 +95,98 @@ QOpenGLFunctions_4_4_Compatibility::QOpenGLFunctions_4_4_Compatibility()
 
 QOpenGLFunctions_4_4_Compatibility::~QOpenGLFunctions_4_4_Compatibility()
 {
-    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_3_1_Core)
+        Q_ASSERT(d_3_0_Core->refs.load());
+    }
+    if (d_3_1_Core) {
         d_3_1_Core->refs.deref();
-    Q_ASSERT(d_3_1_Core->refs.load());
-    if (d_3_2_Core)
+        Q_ASSERT(d_3_1_Core->refs.load());
+    }
+    if (d_3_2_Core) {
         d_3_2_Core->refs.deref();
-    Q_ASSERT(d_3_2_Core->refs.load());
-    if (d_3_3_Core)
+        Q_ASSERT(d_3_2_Core->refs.load());
+    }
+    if (d_3_3_Core) {
         d_3_3_Core->refs.deref();
-    Q_ASSERT(d_3_3_Core->refs.load());
-    if (d_4_0_Core)
+        Q_ASSERT(d_3_3_Core->refs.load());
+    }
+    if (d_4_0_Core) {
         d_4_0_Core->refs.deref();
-    Q_ASSERT(d_4_0_Core->refs.load());
-    if (d_4_1_Core)
+        Q_ASSERT(d_4_0_Core->refs.load());
+    }
+    if (d_4_1_Core) {
         d_4_1_Core->refs.deref();
-    Q_ASSERT(d_4_1_Core->refs.load());
-    if (d_4_2_Core)
+        Q_ASSERT(d_4_1_Core->refs.load());
+    }
+    if (d_4_2_Core) {
         d_4_2_Core->refs.deref();
-    Q_ASSERT(d_4_2_Core->refs.load());
-    if (d_4_3_Core)
+        Q_ASSERT(d_4_2_Core->refs.load());
+    }
+    if (d_4_3_Core) {
         d_4_3_Core->refs.deref();
-    Q_ASSERT(d_4_3_Core->refs.load());
-    if (d_4_4_Core)
+        Q_ASSERT(d_4_3_Core->refs.load());
+    }
+    if (d_4_4_Core) {
         d_4_4_Core->refs.deref();
-    Q_ASSERT(d_4_4_Core->refs.load());
-    if (d_1_0_Deprecated)
+        Q_ASSERT(d_4_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());
-    if (d_3_3_Deprecated)
+        Q_ASSERT(d_1_4_Deprecated->refs.load());
+    }
+    if (d_3_3_Deprecated) {
         d_3_3_Deprecated->refs.deref();
-    Q_ASSERT(d_3_3_Deprecated->refs.load());
+        Q_ASSERT(d_3_3_Deprecated->refs.load());
+    }
 }
 
 bool QOpenGLFunctions_4_4_Compatibility::initializeOpenGLFunctions()
diff --git a/src/gui/opengl/qopenglfunctions_4_4_core.cpp b/src/gui/opengl/qopenglfunctions_4_4_core.cpp
index 95bfc3a4384..019a70087aa 100644
--- a/src/gui/opengl/qopenglfunctions_4_4_core.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_4_core.cpp
@@ -89,57 +89,74 @@ QOpenGLFunctions_4_4_Core::QOpenGLFunctions_4_4_Core()
 
 QOpenGLFunctions_4_4_Core::~QOpenGLFunctions_4_4_Core()
 {
-    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_3_1_Core)
+        Q_ASSERT(d_3_0_Core->refs.load());
+    }
+    if (d_3_1_Core) {
         d_3_1_Core->refs.deref();
-    Q_ASSERT(d_3_1_Core->refs.load());
-    if (d_3_2_Core)
+        Q_ASSERT(d_3_1_Core->refs.load());
+    }
+    if (d_3_2_Core) {
         d_3_2_Core->refs.deref();
-    Q_ASSERT(d_3_2_Core->refs.load());
-    if (d_3_3_Core)
+        Q_ASSERT(d_3_2_Core->refs.load());
+    }
+    if (d_3_3_Core) {
         d_3_3_Core->refs.deref();
-    Q_ASSERT(d_3_3_Core->refs.load());
-    if (d_4_0_Core)
+        Q_ASSERT(d_3_3_Core->refs.load());
+    }
+    if (d_4_0_Core) {
         d_4_0_Core->refs.deref();
-    Q_ASSERT(d_4_0_Core->refs.load());
-    if (d_4_1_Core)
+        Q_ASSERT(d_4_0_Core->refs.load());
+    }
+    if (d_4_1_Core) {
         d_4_1_Core->refs.deref();
-    Q_ASSERT(d_4_1_Core->refs.load());
-    if (d_4_2_Core)
+        Q_ASSERT(d_4_1_Core->refs.load());
+    }
+    if (d_4_2_Core) {
         d_4_2_Core->refs.deref();
-    Q_ASSERT(d_4_2_Core->refs.load());
-    if (d_4_3_Core)
+        Q_ASSERT(d_4_2_Core->refs.load());
+    }
+    if (d_4_3_Core) {
         d_4_3_Core->refs.deref();
-    Q_ASSERT(d_4_3_Core->refs.load());
-    if (d_4_4_Core)
+        Q_ASSERT(d_4_3_Core->refs.load());
+    }
+    if (d_4_4_Core) {
         d_4_4_Core->refs.deref();
-    Q_ASSERT(d_4_4_Core->refs.load());
+        Q_ASSERT(d_4_4_Core->refs.load());
+    }
 }
 
 bool QOpenGLFunctions_4_4_Core::initializeOpenGLFunctions()
diff --git a/src/gui/opengl/qopenglfunctions_4_5_compatibility.cpp b/src/gui/opengl/qopenglfunctions_4_5_compatibility.cpp
index 81ee8559a51..f9d2bb9ceb3 100644
--- a/src/gui/opengl/qopenglfunctions_4_5_compatibility.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_5_compatibility.cpp
@@ -97,81 +97,106 @@ QOpenGLFunctions_4_5_Compatibility::QOpenGLFunctions_4_5_Compatibility()
 
 QOpenGLFunctions_4_5_Compatibility::~QOpenGLFunctions_4_5_Compatibility()
 {
-    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_3_1_Core)
+        Q_ASSERT(d_3_0_Core->refs.load());
+    }
+    if (d_3_1_Core) {
         d_3_1_Core->refs.deref();
-    Q_ASSERT(d_3_1_Core->refs.load());
-    if (d_3_2_Core)
+        Q_ASSERT(d_3_1_Core->refs.load());
+    }
+    if (d_3_2_Core) {
         d_3_2_Core->refs.deref();
-    Q_ASSERT(d_3_2_Core->refs.load());
-    if (d_3_3_Core)
+        Q_ASSERT(d_3_2_Core->refs.load());
+    }
+    if (d_3_3_Core) {
         d_3_3_Core->refs.deref();
-    Q_ASSERT(d_3_3_Core->refs.load());
-    if (d_4_0_Core)
+        Q_ASSERT(d_3_3_Core->refs.load());
+    }
+    if (d_4_0_Core) {
         d_4_0_Core->refs.deref();
-    Q_ASSERT(d_4_0_Core->refs.load());
-    if (d_4_1_Core)
+        Q_ASSERT(d_4_0_Core->refs.load());
+    }
+    if (d_4_1_Core) {
         d_4_1_Core->refs.deref();
-    Q_ASSERT(d_4_1_Core->refs.load());
-    if (d_4_2_Core)
+        Q_ASSERT(d_4_1_Core->refs.load());
+    }
+    if (d_4_2_Core) {
         d_4_2_Core->refs.deref();
-    Q_ASSERT(d_4_2_Core->refs.load());
-    if (d_4_3_Core)
+        Q_ASSERT(d_4_2_Core->refs.load());
+    }
+    if (d_4_3_Core) {
         d_4_3_Core->refs.deref();
-    Q_ASSERT(d_4_3_Core->refs.load());
-    if (d_4_4_Core)
+        Q_ASSERT(d_4_3_Core->refs.load());
+    }
+    if (d_4_4_Core) {
         d_4_4_Core->refs.deref();
-    Q_ASSERT(d_4_4_Core->refs.load());
-    if (d_4_5_Core)
+        Q_ASSERT(d_4_4_Core->refs.load());
+    }
+    if (d_4_5_Core) {
         d_4_5_Core->refs.deref();
-    Q_ASSERT(d_4_5_Core->refs.load());
-    if (d_1_0_Deprecated)
+        Q_ASSERT(d_4_5_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());
-    if (d_3_3_Deprecated)
+        Q_ASSERT(d_1_4_Deprecated->refs.load());
+    }
+    if (d_3_3_Deprecated) {
         d_3_3_Deprecated->refs.deref();
-    Q_ASSERT(d_3_3_Deprecated->refs.load());
-    if (d_4_5_Deprecated)
+        Q_ASSERT(d_3_3_Deprecated->refs.load());
+    }
+    if (d_4_5_Deprecated) {
         d_4_5_Deprecated->refs.deref();
-    Q_ASSERT(d_4_5_Deprecated->refs.load());
+        Q_ASSERT(d_4_5_Deprecated->refs.load());
+    }
 }
 
 bool QOpenGLFunctions_4_5_Compatibility::initializeOpenGLFunctions()
diff --git a/src/gui/opengl/qopenglfunctions_4_5_core.cpp b/src/gui/opengl/qopenglfunctions_4_5_core.cpp
index 2fdb9ef855f..27c0223cf95 100644
--- a/src/gui/opengl/qopenglfunctions_4_5_core.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_5_core.cpp
@@ -90,60 +90,78 @@ QOpenGLFunctions_4_5_Core::QOpenGLFunctions_4_5_Core()
 
 QOpenGLFunctions_4_5_Core::~QOpenGLFunctions_4_5_Core()
 {
-    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_3_1_Core)
+        Q_ASSERT(d_3_0_Core->refs.load());
+    }
+    if (d_3_1_Core) {
         d_3_1_Core->refs.deref();
-    Q_ASSERT(d_3_1_Core->refs.load());
-    if (d_3_2_Core)
+        Q_ASSERT(d_3_1_Core->refs.load());
+    }
+    if (d_3_2_Core) {
         d_3_2_Core->refs.deref();
-    Q_ASSERT(d_3_2_Core->refs.load());
-    if (d_3_3_Core)
+        Q_ASSERT(d_3_2_Core->refs.load());
+    }
+    if (d_3_3_Core) {
         d_3_3_Core->refs.deref();
-    Q_ASSERT(d_3_3_Core->refs.load());
-    if (d_4_0_Core)
+        Q_ASSERT(d_3_3_Core->refs.load());
+    }
+    if (d_4_0_Core) {
         d_4_0_Core->refs.deref();
-    Q_ASSERT(d_4_0_Core->refs.load());
-    if (d_4_1_Core)
+        Q_ASSERT(d_4_0_Core->refs.load());
+    }
+    if (d_4_1_Core) {
         d_4_1_Core->refs.deref();
-    Q_ASSERT(d_4_1_Core->refs.load());
-    if (d_4_2_Core)
+        Q_ASSERT(d_4_1_Core->refs.load());
+    }
+    if (d_4_2_Core) {
         d_4_2_Core->refs.deref();
-    Q_ASSERT(d_4_2_Core->refs.load());
-    if (d_4_3_Core)
+        Q_ASSERT(d_4_2_Core->refs.load());
+    }
+    if (d_4_3_Core) {
         d_4_3_Core->refs.deref();
-    Q_ASSERT(d_4_3_Core->refs.load());
-    if (d_4_4_Core)
+        Q_ASSERT(d_4_3_Core->refs.load());
+    }
+    if (d_4_4_Core) {
         d_4_4_Core->refs.deref();
-    Q_ASSERT(d_4_4_Core->refs.load());
-    if (d_4_5_Core)
+        Q_ASSERT(d_4_4_Core->refs.load());
+    }
+    if (d_4_5_Core) {
         d_4_5_Core->refs.deref();
-    Q_ASSERT(d_4_5_Core->refs.load());
+        Q_ASSERT(d_4_5_Core->refs.load());
+    }
 }
 
 bool QOpenGLFunctions_4_5_Core::initializeOpenGLFunctions()