diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2013-11-13 12:31:51 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@digia.com> | 2013-11-13 13:17:03 +0100 |
| commit | b71bbd57fd8a1ca95a0a9d9e99d78e10fe2216b6 (patch) | |
| tree | 0fbc48089c67843cd87d175c512d94ec4e7839c0 /src/plugins/updateinfo | |
| parent | a218628a6fa74bafbfaffb628d15dad77bc418e9 (diff) | |
| download | qt-creator-b71bbd57fd8a1ca95a0a9d9e99d78e10fe2216b6.tar.gz | |
Fix PluginManager warning on shutdown
Don't try to deregister settingspage if it's a zero pointer.
Change-Id: If70370bf117713f0a9495e720f0df907c7a9df56
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Diffstat (limited to 'src/plugins/updateinfo')
| -rw-r--r-- | src/plugins/updateinfo/updateinfoplugin.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/plugins/updateinfo/updateinfoplugin.cpp b/src/plugins/updateinfo/updateinfoplugin.cpp index ad01d1dbcd..eb09d92c2a 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())); |