From 14effaf9cb5ac0491c877de1ea565967b50e304d Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 4 Nov 2021 19:49:57 +0100 Subject: [PATCH] Allow clearing the wizards path The QmlDesigner now depends on the CppEditor plugin and the CppEditor plugin enables most of the C++ related wizards. The easiest solution is to simply clear the wizard paths before setting the QDS specific path. Change-Id: I7ee6c84693053e6ad32ec28a6cf262dee615992f Reviewed-by: Qt CI Bot Reviewed-by: Eike Ziller --- src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp | 5 +++++ src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h | 1 + 2 files changed, 6 insertions(+) diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp index 31155c276c0..d460995aa81 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp @@ -494,6 +494,11 @@ void JsonWizardFactory::addWizardPath(const FilePath &path) searchPaths().append(path); } +void JsonWizardFactory::clearWizardPaths() +{ + searchPaths().clear(); +} + void JsonWizardFactory::setVerbose(int level) { m_verbose = level; diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h index d69aaa00f0b..2ecabe6bc3d 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h @@ -51,6 +51,7 @@ class PROJECTEXPLORER_EXPORT JsonWizardFactory : public Core::IWizardFactory public: // Add search paths for wizard.json files. All subdirs are going to be checked. static void addWizardPath(const Utils::FilePath &path); + static void clearWizardPaths(); // actual interface of the wizard factory: class Generator {