From c42ae96ba8c65a1a0d76903dfabf478133a677ae Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Fri, 30 Sep 2022 08:37:46 +0200
Subject: [PATCH] Squish: Move wizard into plugin

Avoids a soft assert when parsing the wizards without having
the Squish plugin enabled.
As the Squish wizard is using customized wizard generators
that are only available if Squish is loaded we should limit
the presence of the wizard file to this case.

Change-Id: I091c1e429f28b07679245abdc9a638135af84761
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/squish/squish.qrc                                    | 1 +
 src/plugins/squish/squishplugin.cpp                              | 1 +
 .../projects/squish => src/plugins/squish/wizard}/wizard.json    | 0
 3 files changed, 2 insertions(+)
 rename {share/qtcreator/templates/wizards/projects/squish => src/plugins/squish/wizard}/wizard.json (100%)

diff --git a/src/plugins/squish/squish.qrc b/src/plugins/squish/squish.qrc
index d9c7130419d..830a60d5aa7 100644
--- a/src/plugins/squish/squish.qrc
+++ b/src/plugins/squish/squish.qrc
@@ -8,5 +8,6 @@
         <file>images/jumpTo@2x.png</file>
         <file>images/data.png</file>
         <file>images/data@2x.png</file>
+        <file>wizard/wizard.json</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/squish/squishplugin.cpp b/src/plugins/squish/squishplugin.cpp
index 5f3cfaea4e4..ced619fbca5 100644
--- a/src/plugins/squish/squishplugin.cpp
+++ b/src/plugins/squish/squishplugin.cpp
@@ -105,6 +105,7 @@ void SquishPluginPrivate::initializeMenuEntries()
 bool SquishPlugin::initialize(const QStringList &, QString *)
 {
     dd = new SquishPluginPrivate;
+    ProjectExplorer::JsonWizardFactory::addWizardPath(":/squish/wizard/");
     return true;
 }
 
diff --git a/share/qtcreator/templates/wizards/projects/squish/wizard.json b/src/plugins/squish/wizard/wizard.json
similarity index 100%
rename from share/qtcreator/templates/wizards/projects/squish/wizard.json
rename to src/plugins/squish/wizard/wizard.json