Do not use QWeakPointer to track QObjects.

This use case is deprecated in Qt 5. Use QPointer instead.

Change-Id: Id6c32542032656d7cb31cf838d93a680ab9e9327
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

3 files changed, 10 insertions, 8 deletions

diff --git a/src/libs/qmleditorwidgets/contextpanewidget.cpp b/src/libs/qmleditorwidgets/contextpanewidget.cpp
index 6fe788357a..922dee7d3c 100644
--- a/src/libs/qmleditorwidgets/contextpanewidget.cpp
+++ b/src/libs/qmleditorwidgets/contextpanewidget.cpp
@@ -244,7 +244,7 @@ ContextPaneWidget::~ContextPaneWidget()
     //if the pane was never activated the widget is not in a widget tree
     if (!m_bauhausColorDialog.isNull())
         delete m_bauhausColorDialog.data();
-        m_bauhausColorDialog.clear();
+        m_bauhausColorDialog = 0;
 }
 
 void ContextPaneWidget::activate(const QPoint &pos, const QPoint &alternative, const QPoint &alternative2, bool pinned)
diff --git a/src/libs/qmleditorwidgets/contextpanewidget.h b/src/libs/qmleditorwidgets/contextpanewidget.h
index cf3ed1c618..fd4328fdff 100644
--- a/src/libs/qmleditorwidgets/contextpanewidget.h
+++ b/src/libs/qmleditorwidgets/contextpanewidget.h
@@ -33,7 +33,7 @@
 
 #include <qmleditorwidgets_global.h>
 #include <QFrame>
-#include <QWeakPointer>
+#include <QPointer>
 
 QT_BEGIN_NAMESPACE
 class QToolButton;
@@ -76,7 +76,7 @@ private:
     QGraphicsDropShadowEffect *m_dropShadowEffect;
     QGraphicsOpacityEffect *m_opacityEffect;
     QPoint m_startPos;
-    QWeakPointer<QWidget> m_secondaryTarget;
+    QPointer<QWidget> m_secondaryTarget;
 };
 
 class QMLEDITORWIDGETS_EXPORT ContextPaneWidget : public DragWidget
@@ -138,9 +138,9 @@ private:
     ContextPaneWidgetImage *m_imageWidget;
     ContextPaneWidgetImage *m_borderImageWidget;
     ContextPaneWidgetRectangle *m_rectangleWidget;
-    QWeakPointer<CustomColorDialog> m_bauhausColorDialog;
-    QWeakPointer<QAction> m_resetAction;
-    QWeakPointer<QAction> m_disableAction;
+    QPointer<CustomColorDialog> m_bauhausColorDialog;
+    QPointer<QAction> m_resetAction;
+    QPointer<QAction> m_disableAction;
     QString m_colorName;
     QPoint m_originalPos;
     bool m_pinned;
diff --git a/src/libs/qmleditorwidgets/contextpanewidgetimage.h b/src/libs/qmleditorwidgets/contextpanewidgetimage.h
index 3e533ef28c..25911ef0a6 100644
--- a/src/libs/qmleditorwidgets/contextpanewidgetimage.h
+++ b/src/libs/qmleditorwidgets/contextpanewidgetimage.h
@@ -32,10 +32,12 @@
 #define CONTEXTPANEWIDGETIMAGE_H
 
 #include <qmleditorwidgets_global.h>
-#include <QLabel>
 #include <contextpanewidget.h>
 #include <qdrawutil.h>
 
+#include <QLabel>
+#include <QPointer>
+
 QT_BEGIN_NAMESPACE
 namespace Ui {
     class ContextPaneWidgetImage;
@@ -157,7 +159,7 @@ private:
     Ui::ContextPaneWidgetImage *ui;
     Ui::ContextPaneWidgetBorderImage *uiBorderImage;
     QString m_path;
-    QWeakPointer<PreviewDialog> m_previewDialog;    
+    QPointer<PreviewDialog> m_previewDialog;
     FileWidget *m_fileWidget;
     QLabel *m_sizeLabel;
     bool m_borderImage;