Don't print leak warnings on exit by default

Task-number: QTBUG-29780
Change-Id: I6f35253dbec6346af239c0ab341caad9f4f9b862
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>

1 files changed, 16 insertions, 8 deletions

diff --git a/src/quick/scenegraph/coreapi/qsgmaterial.cpp b/src/quick/scenegraph/coreapi/qsgmaterial.cpp
index 0e40a01311..f678504344 100644
--- a/src/quick/scenegraph/coreapi/qsgmaterial.cpp
+++ b/src/quick/scenegraph/coreapi/qsgmaterial.cpp
@@ -44,6 +44,10 @@
 
 QT_BEGIN_NAMESPACE
 
+#ifndef QT_NO_DEBUG
+static bool qsg_leak_check = !qgetenv("QML_LEAK_CHECK").isEmpty();
+#endif
+
 /*!
     \group qtquick-scenegraph-materials
     \title Qt Quick Scene Graph Material Classes
@@ -538,11 +542,13 @@ QSGMaterial::QSGMaterial()
     : m_flags(0)
 {
 #ifndef QT_NO_DEBUG
-    ++qt_material_count;
-    static bool atexit_registered = false;
-    if (!atexit_registered) {
-        atexit(qt_print_material_count);
-        atexit_registered = true;
+    if (qsg_leak_check) {
+        ++qt_material_count;
+        static bool atexit_registered = false;
+        if (!atexit_registered) {
+            atexit(qt_print_material_count);
+            atexit_registered = true;
+        }
     }
 #endif
 }
@@ -555,9 +561,11 @@ QSGMaterial::QSGMaterial()
 QSGMaterial::~QSGMaterial()
 {
 #ifndef QT_NO_DEBUG
-    --qt_material_count;
-    if (qt_material_count < 0)
-        qDebug("Material destroyed after qt_print_material_count() was called.");
+    if (qsg_leak_check) {
+        --qt_material_count;
+        if (qt_material_count < 0)
+            qDebug("Material destroyed after qt_print_material_count() was called.");
+    }
 #endif
 }