feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix PluginManager warning on shutdown

Browse Source 
Don't try to deregister settingspage if it's a zero pointer.

Change-Id: If70370bf117713f0a9495e720f0df907c7a9df56
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
This commit is contained in:
Kai Koehne
2013-11-13 12:31:51 +01:00
parent a218628a6f
commit b71bbd57fd
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/updateinfo/updateinfoplugin.cpp
View File

@@ -67,10 +67,6 @@ public:
m_settingsPage(0) m_settingsPage(0)
{ {
} }
~UpdateInfoPluginPrivate()
{
delete m_settingsPage;
}
QString updaterProgram; QString updaterProgram;
QString updaterRunUiArgument; QString updaterRunUiArgument;
@@ -95,7 +91,6 @@ UpdateInfoPlugin::UpdateInfoPlugin()
UpdateInfoPlugin::~UpdateInfoPlugin() UpdateInfoPlugin::~UpdateInfoPlugin()
{ {
removeObject(d->m_settingsPage);
delete d; delete d;
} }
@@ -128,7 +123,7 @@ bool UpdateInfoPlugin::initialize(const QStringList & /* arguments */, QString *
} }
d->m_settingsPage = new SettingsPage(this); d->m_settingsPage = new SettingsPage(this);
addObject(d->m_settingsPage); addAutoReleasedObject(d->m_settingsPage);
ActionContainer *const container = ActionManager::actionContainer(Core::Constants::M_HELP); ActionContainer *const container = ActionManager::actionContainer(Core::Constants::M_HELP);
container->menu()->addAction(tr("Start Updater"), this, SLOT(startUpdaterUiApplication())); container->menu()->addAction(tr("Start Updater"), this, SLOT(startUpdaterUiApplication()));