From 85e3061b7acaef3f12bb0192c91eb2ce83ba368e Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Fri, 4 Feb 2022 16:38:09 +0100
Subject: [PATCH] QmlDesigner: Move wizard registration to StudioWelcome

Change-Id: Iacaac80420da96f6757236db6c15ac23a6f723cf
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 .../qmldesigner/studioplugin/studioplugin.cpp | 21 -------------------
 .../studiowelcome/studiowelcomeplugin.cpp     | 12 +++++++++--
 2 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/src/plugins/qmldesigner/studioplugin/studioplugin.cpp b/src/plugins/qmldesigner/studioplugin/studioplugin.cpp
index d31c1d88f59..6d3f7b8e8b4 100644
--- a/src/plugins/qmldesigner/studioplugin/studioplugin.cpp
+++ b/src/plugins/qmldesigner/studioplugin/studioplugin.cpp
@@ -18,31 +18,10 @@
 
 #include "studioplugin.h"
 
-#include <modelnodecontextmenu_helper.h>
-#include <componentcore_constants.h>
-#include <qmldesignerplugin.h>
-#include <viewmanager.h>
-
-#include <extensionsystem/pluginmanager.h>
-#include <extensionsystem/pluginspec.h>
-#include <coreplugin/icore.h>
-
-#include <utils/qtcassert.h>
-#include <utils/utilsicons.h>
-
-#include <projectexplorer/jsonwizard/jsonwizardfactory.h>
-#include <projectexplorer/runconfiguration.h>
-
-#include <QtPlugin>
-
 namespace QmlDesigner {
 
-using namespace ProjectExplorer;
-
 StudioPlugin::StudioPlugin()
 {
-    JsonWizardFactory::clearWizardPaths();
-    JsonWizardFactory::addWizardPath(Core::ICore::resourcePath("qmldesigner/studio_templates"));
 }
 
 QString StudioPlugin::pluginName() const
diff --git a/src/plugins/studiowelcome/studiowelcomeplugin.cpp b/src/plugins/studiowelcome/studiowelcomeplugin.cpp
index 9ba6ed9b808..6e84db4f9b3 100644
--- a/src/plugins/studiowelcome/studiowelcomeplugin.cpp
+++ b/src/plugins/studiowelcome/studiowelcomeplugin.cpp
@@ -41,9 +41,12 @@
 #include <extensionsystem/pluginmanager.h>
 #include <extensionsystem/pluginspec.h>
 
+#include <projectexplorer/jsonwizard/jsonwizardfactory.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectmanager.h>
 
+#include <qmlprojectmanager/qmlproject.h>
+
 #include <qmldesigner/qmldesignerplugin.h>
 #include <qmldesigner/components/componentcore/theme.h>
 
@@ -580,9 +583,14 @@ void StudioWelcomePlugin::extensionsInitialized()
 {
     Core::ModeManager::activateMode(m_welcomeMode->id());
 
-    // Enable QDS new project dialog
-    if (Core::ICore::settings()->value("QML/Designer/StandAloneMode", false).toBool())
+    // Enable QDS new project dialog and QDS wizards
+    if (QmlProjectManager::QmlProject::isQtDesignStudio()) {
+        ProjectExplorer::JsonWizardFactory::clearWizardPaths();
+        ProjectExplorer::JsonWizardFactory::addWizardPath(
+            Core::ICore::resourcePath("qmldesigner/studio_templates"));
+
         Core::ICore::setNewDialogFactory([](QWidget *parent) { return new QdsNewDialog(parent); });
+    }
 
     if (showSplashScreen()) {
         connect(Core::ICore::instance(), &Core::ICore::coreOpened, this, [this] {