From a16d712c117a45e1bee45ea8ffb723a97572dc48 Mon Sep 17 00:00:00 2001 From: Nikita Baryshnikov Date: Fri, 23 Mar 2018 13:55:16 +0300 Subject: [PATCH] CMakeSpecificSettingsPage: delete SettingsWidget Also added Q_OBJECT macro, for tr call in ctor. Change-Id: I4766b6299a07e3ba0ebc8577e9f4471021b89f07 Reviewed-by: hjk --- .../cmakeprojectmanager/cmakespecificsettingspage.cpp | 6 ++++++ src/plugins/cmakeprojectmanager/cmakespecificsettingspage.h | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakespecificsettingspage.cpp b/src/plugins/cmakeprojectmanager/cmakespecificsettingspage.cpp index a8239ced29a..4f3f4eca721 100644 --- a/src/plugins/cmakeprojectmanager/cmakespecificsettingspage.cpp +++ b/src/plugins/cmakeprojectmanager/cmakespecificsettingspage.cpp @@ -102,5 +102,11 @@ void CMakeSpecificSettingsPage::apply() m_settings->toSettings(Core::ICore::settings()); } +void CMakeSpecificSettingsPage::finish() +{ + delete m_widget; + m_widget = nullptr; +} + } // Internal } // CMakeProjectManager diff --git a/src/plugins/cmakeprojectmanager/cmakespecificsettingspage.h b/src/plugins/cmakeprojectmanager/cmakespecificsettingspage.h index 59bf25d35b0..ef40f463394 100644 --- a/src/plugins/cmakeprojectmanager/cmakespecificsettingspage.h +++ b/src/plugins/cmakeprojectmanager/cmakespecificsettingspage.h @@ -52,15 +52,16 @@ private: class CMakeSpecificSettingsPage : public Core::IOptionsPage { + Q_OBJECT public: CMakeSpecificSettingsPage(CMakeSpecificSettings *settings, QObject *parent); QWidget *widget() override; void apply() override; - void finish() override { } + void finish() override; private: - CMakeSpecificSettings * const m_settings; + CMakeSpecificSettings * const m_settings = nullptr; QPointer m_widget; };