diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-01-11 10:48:42 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-01-11 10:48:42 +0100 |
| commit | 4264061a20c6e1d42c043ada95b4e231df907d27 (patch) | |
| tree | 75b708195af7dd19949b0b047fefb7b56269ba17 /src/quicktemplates2/qquickcontrol.cpp | |
| parent | 0a86cab635e66ba44dcf3866c698aa1d037acff9 (diff) | |
| parent | 00a062649b8aec20c3ac3f61aa72b1cdde43b055 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: If797ac58344b20e8de4379343131c097247ba2f2
Diffstat (limited to 'src/quicktemplates2/qquickcontrol.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickcontrol.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp index b5b98c8f..651afb59 100644 --- a/src/quicktemplates2/qquickcontrol.cpp +++ b/src/quicktemplates2/qquickcontrol.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. @@ -850,7 +850,7 @@ void QQuickControlPrivate::deleteDelegate(QObject *delegate) { if (componentComplete) delete delegate; - else + else if (delegate) extra.value().pendingDeletions.append(delegate); } |