3 files changed, 29 insertions, 24 deletions
diff --git a/src/plugins/qmljstools/qmlformatsettingswidget.cpp b/src/plugins/qmljstools/qmlformatsettingswidget.cpp
index e18f75b773c..2b824c92bae 100644
--- a/src/plugins/qmljstools/qmlformatsettingswidget.cpp
+++ b/src/plugins/qmljstools/qmlformatsettingswidget.cpp
@@ -4,15 +4,33 @@
 #include "qmlformatsettingswidget.h"
 #include "qmljsformatterselectionwidget.h"
 #include "qmlformatsettings.h"
+#include "qmljscodestylesettings.h"
 #include "qmljstoolstr.h"
 
 #include <texteditor/snippets/snippeteditor.h>
+
 #include <utils/layoutbuilder.h>
 
-#include <QVBoxLayout>
+#include <memory>
 
 namespace QmlJSTools {
 
+class QmlFormatSettingsWidget : public QmlCodeStyleWidgetBase
+{
+public:
+    QmlFormatSettingsWidget(QWidget *parent, FormatterSelectionWidget *selection);
+
+    void setCodeStyleSettings(const QmlJSCodeStyleSettings &s) override;
+    void setPreferences(QmlJSCodeStylePreferences *preferences) override;
+    void slotCurrentPreferencesChanged(TextEditor::ICodeStylePreferences* preferences) override;
+
+private:
+    void slotSettingsChanged();
+    std::unique_ptr<TextEditor::SnippetEditorWidget> m_qmlformatConfigTextEdit;
+    FormatterSelectionWidget *m_formatterSelectionWidget = nullptr;
+    QmlJSCodeStylePreferences *m_preferences = nullptr;
+};
+
 QmlFormatSettingsWidget::QmlFormatSettingsWidget(
     QWidget *parent, FormatterSelectionWidget *selection)
     : QmlCodeStyleWidgetBase(parent)
@@ -95,4 +113,9 @@ void QmlFormatSettingsWidget::slotSettingsChanged()
     emit settingsChanged(settings);
 }
 
+QmlCodeStyleWidgetBase *createQmlFormatSettingsWidget(QWidget *parent, FormatterSelectionWidget *selection)
+{
+    return new QmlFormatSettingsWidget(parent, selection);
+}
+
 } // namespace QmlJSTools
diff --git a/src/plugins/qmljstools/qmlformatsettingswidget.h b/src/plugins/qmljstools/qmlformatsettingswidget.h
index d192004377b..c39c69f5ea8 100644
--- a/src/plugins/qmljstools/qmlformatsettingswidget.h
+++ b/src/plugins/qmljstools/qmlformatsettingswidget.h
@@ -3,32 +3,14 @@
 
 #pragma once
 
-#include "qmljsformatterselectionwidget.h"
-#include "qmljscodestylesettings.h"
-
-#include <texteditor/snippets/snippeteditor.h>
-
-#include <memory>
 #include <QWidget>
 
 namespace QmlJSTools {
-class FormatterSelectionWidget;
 
-class QmlFormatSettingsWidget : public QmlCodeStyleWidgetBase
-{
-public:
-    explicit QmlFormatSettingsWidget(
-        QWidget *parent = nullptr,
-        FormatterSelectionWidget *selection = nullptr);
-    void setCodeStyleSettings(const QmlJSCodeStyleSettings &s) override;
-    void setPreferences(QmlJSCodeStylePreferences *preferences) override;
-    void slotCurrentPreferencesChanged(TextEditor::ICodeStylePreferences* preferences) override;
+class FormatterSelectionWidget;
+class QmlCodeStyleWidgetBase;
 
-private:
-    void slotSettingsChanged();
-    std::unique_ptr<TextEditor::SnippetEditorWidget> m_qmlformatConfigTextEdit;
-    FormatterSelectionWidget *m_formatterSelectionWidget = nullptr;
-    QmlJSCodeStylePreferences *m_preferences = nullptr;
-};
+QmlCodeStyleWidgetBase *createQmlFormatSettingsWidget(QWidget *parent,
+                                                      FormatterSelectionWidget *selection);
 
 } // namespace QmlJSTools
diff --git a/src/plugins/qmljstools/qmljscodestylesettings.cpp b/src/plugins/qmljstools/qmljscodestylesettings.cpp
index 64bcc132224..15a1e104210 100644
--- a/src/plugins/qmljstools/qmljscodestylesettings.cpp
+++ b/src/plugins/qmljstools/qmljscodestylesettings.cpp
@@ -121,7 +121,7 @@ QmlJSCodeStylePreferencesWidget::QmlJSCodeStylePreferencesWidget(
     , m_formatterSettingsStack(new QStackedWidget(this))
 {
     m_formatterSettingsStack->insertWidget(BuiltinFormatterIndex, new BuiltinFormatterSettingsWidget(this, m_formatterSelectionWidget));
-    m_formatterSettingsStack->insertWidget(QmlFormatIndex, new QmlFormatSettingsWidget(this, m_formatterSelectionWidget));
+    m_formatterSettingsStack->insertWidget(QmlFormatIndex, createQmlFormatSettingsWidget(this, m_formatterSelectionWidget));
     m_formatterSettingsStack->insertWidget(CustomFormatterIndex, new CustomFormatterWidget(this, m_formatterSelectionWidget));
 
     for (const auto &formatterWidget :