From d7ef2aa02c9ba736104fe973bfce7d87e30f81af Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Wed, 7 Dec 2016 13:56:45 +0100
Subject: Qml Inspector: Avoid taking a QPointer of an object being deleted

As we manually remove items to be deleted from the list of selected
items, we don't need to keep them as QPointer in the first place.

Change-Id: Ie416b47d4f193cb3dc7cfb07e66ab2b36ad6721c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp | 4 +---
 src/plugins/qmltooling/qmldbg_inspector/globalinspector.h   | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/plugins')

diff --git a/src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp b/src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp
index 107d54c626..ca7c76ab50 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp
+++ b/src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp
@@ -234,9 +234,7 @@ bool GlobalInspector::syncSelectedItems(const QList<QQuickItem *> &items)
     bool selectionChanged = false;
 
     // Disconnect and remove items that are no longer selected
-    foreach (const QPointer<QQuickItem> &item, m_selectedItems) {
-        if (!item) // Don't see how this can happen due to handling of destroyed()
-            continue;
+    foreach (QQuickItem *item, m_selectedItems) {
         if (items.contains(item))
             continue;
 
diff --git a/src/plugins/qmltooling/qmldbg_inspector/globalinspector.h b/src/plugins/qmltooling/qmldbg_inspector/globalinspector.h
index 338eee14c3..f7b325c454 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/globalinspector.h
+++ b/src/plugins/qmltooling/qmldbg_inspector/globalinspector.h
@@ -84,7 +84,7 @@ private:
     bool syncSelectedItems(const QList<QQuickItem *> &items);
 
     // Hash< object to be destroyed, QPair<destroy eventId, object debugId> >
-    QList<QPointer<QQuickItem> > m_selectedItems;
+    QList<QQuickItem *> m_selectedItems;
     QHash<QQuickItem *, SelectionHighlight *> m_highlightItems;
     QList<QQuickWindowInspector *> m_windowInspectors;
     int m_eventId;
-- 
cgit v1.2.3