Merge remote-tracking branch 'origin/4.3'

 Conflicts:
	src/plugins/genericprojectmanager/genericproject.cpp
	src/plugins/genericprojectmanager/genericproject.h
	src/plugins/genericprojectmanager/genericprojectnodes.cpp
	src/plugins/genericprojectmanager/genericprojectnodes.h

Change-Id: Ie0c870f68c8d200a75489b75860987655b2f6175

4 files changed, 13 insertions, 11 deletions

diff --git a/src/plugins/beautifier/beautifierplugin.cpp b/src/plugins/beautifier/beautifierplugin.cpp
index ad2598152c..4120643882 100644
--- a/src/plugins/beautifier/beautifierplugin.cpp
+++ b/src/plugins/beautifier/beautifierplugin.cpp
@@ -215,7 +215,7 @@ void BeautifierPlugin::extensionsInitialized()
             addAutoReleasedObject(object);
     }
 
-    m_generalSettings = new GeneralSettings;
+    m_generalSettings.reset(new GeneralSettings);
     auto settingsPage = new GeneralOptionsPage(m_generalSettings, toolIds, this);
     addAutoReleasedObject(settingsPage);
 
diff --git a/src/plugins/beautifier/beautifierplugin.h b/src/plugins/beautifier/beautifierplugin.h
index 8fab2a4e03..b75f34bab0 100644
--- a/src/plugins/beautifier/beautifierplugin.h
+++ b/src/plugins/beautifier/beautifierplugin.h
@@ -31,6 +31,7 @@
 
 #include <QPlainTextEdit>
 #include <QPointer>
+#include <QSharedPointer>
 
 namespace Core {
 class IDocument;
@@ -86,7 +87,7 @@ public:
 private:
     void updateActions(Core::IEditor *editor = nullptr);
     QList<BeautifierAbstractTool *> m_tools;
-    GeneralSettings *m_generalSettings = nullptr;
+    QSharedPointer<GeneralSettings> m_generalSettings;
     QHash<QObject*, QMetaObject::Connection> m_autoFormatConnections;
     void formatEditor(TextEditor::TextEditorWidget *editor, const Command &command,
                       int startPos = -1, int endPos = 0);
diff --git a/src/plugins/beautifier/generaloptionspage.cpp b/src/plugins/beautifier/generaloptionspage.cpp
index b4c620054e..4f160e320f 100644
--- a/src/plugins/beautifier/generaloptionspage.cpp
+++ b/src/plugins/beautifier/generaloptionspage.cpp
@@ -36,7 +36,7 @@
 namespace Beautifier {
 namespace Internal {
 
-GeneralOptionsPageWidget::GeneralOptionsPageWidget(GeneralSettings *settings,
+GeneralOptionsPageWidget::GeneralOptionsPageWidget(const QSharedPointer<GeneralSettings> &settings,
                                                    const QStringList &toolIds, QWidget *parent) :
     QWidget(parent),
     ui(new Ui::GeneralOptionsPage),
@@ -73,8 +73,8 @@ void GeneralOptionsPageWidget::apply(bool *autoFormatChanged)
     m_settings->save();
 }
 
-GeneralOptionsPage::GeneralOptionsPage(GeneralSettings *settings, const QStringList &toolIds,
-                                       QObject *parent) :
+GeneralOptionsPage::GeneralOptionsPage(const QSharedPointer<GeneralSettings> &settings,
+                                       const QStringList &toolIds, QObject *parent) :
     IOptionsPage(parent),
     m_settings(settings),
     m_toolIds(toolIds)
diff --git a/src/plugins/beautifier/generaloptionspage.h b/src/plugins/beautifier/generaloptionspage.h
index 2f6d79dd90..3500e7c2db 100644
--- a/src/plugins/beautifier/generaloptionspage.h
+++ b/src/plugins/beautifier/generaloptionspage.h
@@ -28,6 +28,7 @@
 #include <coreplugin/dialogs/ioptionspage.h>
 
 #include <QPointer>
+#include <QSharedPointer>
 #include <QWidget>
 
 namespace Beautifier {
@@ -42,15 +43,15 @@ class GeneralOptionsPageWidget : public QWidget
     Q_OBJECT
 
 public:
-    explicit GeneralOptionsPageWidget(GeneralSettings *settings, const QStringList &toolIds,
-                                      QWidget *parent = nullptr);
+    explicit GeneralOptionsPageWidget(const QSharedPointer<GeneralSettings> &settings,
+                                      const QStringList &toolIds, QWidget *parent = nullptr);
     virtual ~GeneralOptionsPageWidget();
     void restore();
     void apply(bool *autoFormatChanged);
 
 private:
     Ui::GeneralOptionsPage *ui;
-    GeneralSettings *m_settings;
+    QSharedPointer<GeneralSettings> m_settings;
 };
 
 class GeneralOptionsPage : public Core::IOptionsPage
@@ -58,8 +59,8 @@ class GeneralOptionsPage : public Core::IOptionsPage
     Q_OBJECT
 
 public:
-    explicit GeneralOptionsPage(GeneralSettings *settings, const QStringList &toolIds,
-                                QObject *parent = nullptr);
+    explicit GeneralOptionsPage(const QSharedPointer<GeneralSettings> &settings,
+                                const QStringList &toolIds, QObject *parent = nullptr);
     QWidget *widget() override;
     void apply() override;
     void finish() override;
@@ -69,7 +70,7 @@ signals:
 
 private:
     QPointer<GeneralOptionsPageWidget> m_widget;
-    GeneralSettings *m_settings;
+    QSharedPointer<GeneralSettings> m_settings;
     QStringList m_toolIds;
 };