Merge remote-tracking branch 'github/2.5'

KDAB · Aug 3, 2016 · a38b17a · a38b17a
2 parents 7cd0fe6 + 53f20fc
commit a38b17a
Show file tree

Hide file tree

Showing 12 changed files with 58 additions and 4 deletions.
diff --git a/3rdparty/qt/resourcemodel.cpp b/3rdparty/qt/resourcemodel.cpp
@@ -250,7 +250,7 @@ ResourceModel::ResourceModel(QObject *parent)
 
 ResourceModel::~ResourceModel()
 {
-
+    delete d_ptr;
 }
 
 /*!

diff --git a/core/metaobjectrepository.cpp b/core/metaobjectrepository.cpp
@@ -220,6 +220,7 @@ MetaObjectRepository *MetaObjectRepository::instance()
 void MetaObjectRepository::addMetaObject(MetaObject *mo)
 {
     Q_ASSERT(!mo->className().isEmpty());
+    Q_ASSERT(!m_metaObjects.contains(mo->className()));
     m_metaObjects.insert(mo->className(), mo);
 }
 
@@ -238,3 +239,10 @@ bool MetaObjectRepository::hasMetaObject(const QString &typeName) const
 {
     return m_metaObjects.contains(typeName);
 }
+
+void MetaObjectRepository::clear()
+{
+    qDeleteAll(m_metaObjects);
+    m_metaObjects.clear();
+    m_initialized = false;
+}
diff --git a/core/metaobjectrepository.h b/core/metaobjectrepository.h
@@ -72,6 +72,13 @@ class GAMMARAY_CORE_EXPORT MetaObjectRepository
      */
     bool hasMetaObject(const QString &typeName) const;
 
+    /*!
+     * Clears the content of the meta object repository.
+     * Call this when removing the probe from a target.
+     * \internal
+     */
+    void clear();
+
 protected:
     MetaObjectRepository();
 

diff --git a/core/probe.cpp b/core/probe.cpp
@@ -31,6 +31,7 @@
 #include <config-gammaray.h>
 
 #include "probe.h"
+#include "metaobjectrepository.h"
 #include "objectlistmodel.h"
 #include "objecttreemodel.h"
 #include "metaobjecttreemodel.h"
@@ -265,6 +266,7 @@ Probe::~Probe()
 
     ObjectBroker::clear();
     ProbeSettings::resetLauncherIdentifier();
+    MetaObjectRepository::instance()->clear();
 
     s_instance = QAtomicPointer<Probe>(0);
 }

diff --git a/core/probesettings.cpp b/core/probesettings.cpp
@@ -59,6 +59,7 @@ class ProbeSettingsReceiver : public QObject
     Q_OBJECT
 public:
     explicit ProbeSettingsReceiver(QObject *parent = Q_NULLPTR);
+    ~ProbeSettingsReceiver();
     Q_INVOKABLE void sendServerAddress(const QUrl &address);
 
     void waitForSettingsReceived();
@@ -81,6 +82,11 @@ ProbeSettingsReceiver::ProbeSettingsReceiver(QObject *parent)
 {
 }
 
+ProbeSettingsReceiver::~ProbeSettingsReceiver()
+{
+    delete m_socket;
+}
+
 void ProbeSettingsReceiver::run()
 {
     m_mutex.lock(); // we only need this for ordering run after waitForSettingsReceived

diff --git a/core/propertycontroller.cpp b/core/propertycontroller.cpp
@@ -53,6 +53,7 @@ PropertyController::~PropertyController()
     const auto i = s_instances.indexOf(this);
     if (i >= 0)
         s_instances.remove(i);
+    qDeleteAll(m_extensions);
 }
 
 void PropertyController::loadExtension(PropertyControllerExtensionFactoryBase *factory)

diff --git a/core/varianthandler.cpp b/core/varianthandler.cpp
@@ -59,10 +59,17 @@ using namespace GammaRay;
 namespace GammaRay {
 struct VariantHandlerRepository
 {
+    ~VariantHandlerRepository();
+
     QHash<int, VariantHandler::Converter<QString> *> stringConverters;
     QVector<VariantHandler::GenericStringConverter> genericStringConverters;
 };
 
+VariantHandlerRepository::~VariantHandlerRepository()
+{
+    qDeleteAll(stringConverters);
+}
+
 static QString displayMatrix4x4(const QMatrix4x4 &matrix)
 {
     QStringList rows;

diff --git a/plugins/quickinspector/quickinspector.cpp b/plugins/quickinspector/quickinspector.cpp
@@ -737,7 +737,6 @@ void QuickInspector::registerVariantHandlers()
     VariantHandler::registerStringConverter<QSGOpacityNode *>(Util::addressToString);
     VariantHandler::registerStringConverter<QSGNode::Flags>(qSGNodeFlagsToString);
     VariantHandler::registerStringConverter<QSGNode::DirtyState>(qSGNodeDirtyStateToString);
-    VariantHandler::registerStringConverter<const QSGClipNode *>(Util::addressToString);
     VariantHandler::registerStringConverter<QSGGeometry *>(Util::addressToString);
     VariantHandler::registerStringConverter<const QSGGeometry *>(Util::addressToString);
     VariantHandler::registerStringConverter<QSGMaterial *>(Util::addressToString);

diff --git a/plugins/signalmonitor/signalhistorymodel.cpp b/plugins/signalmonitor/signalhistorymodel.cpp
@@ -97,6 +97,7 @@ SignalHistoryModel::SignalHistoryModel(ProbeInterface *probe, QObject *parent)
 SignalHistoryModel::~SignalHistoryModel()
 {
     s_historyModel = 0;
+    qDeleteAll(m_tracedObjects);
 }
 
 int SignalHistoryModel::rowCount(const QModelIndex &parent) const

diff --git a/tests/remotemodeltest.cpp b/tests/remotemodeltest.cpp
@@ -173,8 +173,11 @@ private slots:
         QTest::qWait(1);
         QCOMPARE(index.data().toString(), QStringLiteral("entry1"));
 
-        listModel->takeRow(3);
+        const auto deleteMe = listModel->takeRow(3);
+        qDeleteAll(deleteMe);
         QCOMPARE(client.rowCount(), 4);
+
+        delete listModel;
     }
 
     void testTreeRemoteModel()
@@ -225,10 +228,13 @@ private slots:
         QCOMPARE(i11.data().toString(), QStringLiteral("entry11"));
         QCOMPARE(client.rowCount(i11), 0);
 
-        e1->takeRow(0);
+        const auto deleteMe = e1->takeRow(0);
+        qDeleteAll(deleteMe);
         QCOMPARE(client.rowCount(i1), 2);
         i11 = client.index(0, 0, i1);
         QCOMPARE(i11.data().toString(), QStringLiteral("entry11"));
+
+        delete treeModel;
     }
 
     // this should not make a difference if the above works, however it broke massively with Qt 5.4...
@@ -283,6 +289,8 @@ private slots:
         // this fails with data() call batching sizes close to 1
 // QEXPECT_FAIL("", "QSFPM misbehavior, no idea yet where this is coming from", Continue);
         QCOMPARE(proxy.rowCount(pi1), 2);
+
+        delete treeModel;
     }
 };
 

diff --git a/ui/propertywidget.cpp b/ui/propertywidget.cpp
@@ -32,6 +32,7 @@
 #include "common/objectbroker.h"
 #include "common/propertycontrollerinterface.h"
 
+#include <QCoreApplication>
 #include <QTimer>
 
 #include <algorithm>
@@ -87,13 +88,25 @@ void PropertyWidget::setObjectBaseName(const QString &baseName)
     updateShownTabs();
 }
 
+static void propertyWidgetCleanup()
+{
+    PropertyWidget::cleanupTabs();
+}
+
 void PropertyWidget::registerTab(PropertyWidgetTabFactoryBase *factory)
 {
+    if (s_tabFactories.isEmpty())
+        qAddPostRoutine(propertyWidgetCleanup);
     s_tabFactories.push_back(factory);
     foreach (PropertyWidget *widget, s_propertyWidgets)
         widget->updateShownTabs();
 }
 
+void PropertyWidget::cleanupTabs()
+{
+    qDeleteAll(s_tabFactories);
+}
+
 void PropertyWidget::createWidgets()
 {
     if (m_objectBaseName.isEmpty())

diff --git a/ui/propertywidget.h b/ui/propertywidget.h
@@ -71,6 +71,8 @@ class GAMMARAY_UI_EXPORT PropertyWidget : public QTabWidget
         registerTab(new PropertyWidgetTabFactory<T>(name, label, priority));
     }
 
+    //! \internal
+    static void cleanupTabs();
 signals:
     void tabsUpdated();