From 7ef365d756f49ac28bf7a4d93009fa9626dc3f2d Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 23 Aug 2017 10:15:20 +0200 Subject: [PATCH] Do not disable "required" plugins when testing "Required" is only the Core plugin, and that should never be disabled. Fixes the weird issue that running "qtcreator -test WinRt" on non-Windows platforms failed with "Core plugin is disabled". Change-Id: Id349f406e4bde876ae5513c75d39b4b4c052b8ba Reviewed-by: Orgad Shaneh --- src/libs/extensionsystem/optionsparser.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/extensionsystem/optionsparser.cpp b/src/libs/extensionsystem/optionsparser.cpp index babb0587139..9dc6327b65e 100644 --- a/src/libs/extensionsystem/optionsparser.cpp +++ b/src/libs/extensionsystem/optionsparser.cpp @@ -268,7 +268,7 @@ void OptionsParser::forceDisableAllPluginsExceptTestedAndForceEnabled() for (const PluginManagerPrivate::TestSpec &testSpec : m_pmPrivate->testSpecs) testSpec.pluginSpec->d->setForceEnabled(true); for (PluginSpec *spec : m_pmPrivate->pluginSpecs) { - if (!spec->isForceEnabled()) + if (!spec->isForceEnabled() && !spec->isRequired()) spec->d->setForceDisabled(true); } }