From b71bbd57fd8a1ca95a0a9d9e99d78e10fe2216b6 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 13 Nov 2013 12:31:51 +0100 Subject: [PATCH] Fix PluginManager warning on shutdown Don't try to deregister settingspage if it's a zero pointer. Change-Id: If70370bf117713f0a9495e720f0df907c7a9df56 Reviewed-by: Karsten Heimrich --- src/plugins/updateinfo/updateinfoplugin.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/plugins/updateinfo/updateinfoplugin.cpp b/src/plugins/updateinfo/updateinfoplugin.cpp index ad01d1dbcd4..eb09d92c2ac 100644 --- a/src/plugins/updateinfo/updateinfoplugin.cpp +++ b/src/plugins/updateinfo/updateinfoplugin.cpp @@ -67,10 +67,6 @@ public: m_settingsPage(0) { } - ~UpdateInfoPluginPrivate() - { - delete m_settingsPage; - } QString updaterProgram; QString updaterRunUiArgument; @@ -95,7 +91,6 @@ UpdateInfoPlugin::UpdateInfoPlugin() UpdateInfoPlugin::~UpdateInfoPlugin() { - removeObject(d->m_settingsPage); delete d; } @@ -128,7 +123,7 @@ bool UpdateInfoPlugin::initialize(const QStringList & /* arguments */, QString * } d->m_settingsPage = new SettingsPage(this); - addObject(d->m_settingsPage); + addAutoReleasedObject(d->m_settingsPage); ActionContainer *const container = ActionManager::actionContainer(Core::Constants::M_HELP); container->menu()->addAction(tr("Start Updater"), this, SLOT(startUpdaterUiApplication()));