From bac8e84ee732c73481c562378341d795b8dc41ce Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@qt.io>
Date: Fri, 6 Jan 2017 09:52:33 +0100
Subject: QQuickXxxPrivate::deleteDelegate(): don't store null pointers

Avoid unnecessarily allocating extra data and/or pendingDeletions.

Change-Id: I41d68af513c078a48bbe4f026bfe25e9c45ba3a8
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
 src/quicktemplates2/qquicklabel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/quicktemplates2/qquicklabel.cpp')

diff --git a/src/quicktemplates2/qquicklabel.cpp b/src/quicktemplates2/qquicklabel.cpp
index ebd1755a..37a0842f 100644
--- a/src/quicktemplates2/qquicklabel.cpp
+++ b/src/quicktemplates2/qquicklabel.cpp
@@ -175,7 +175,7 @@ void QQuickLabelPrivate::deleteDelegate(QObject *delegate)
 {
     if (componentComplete)
         delete delegate;
-    else
+    else if (delegate)
         pendingDeletions.append(delegate);
 }
 
-- 
cgit v1.2.3