From 8306de731a84b44c0f3aac420957bba782e53393 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 11 May 2020 14:21:57 +0200 Subject: [PATCH] [welcome] Setting requirements from own reqs is totally wrong - The requirements are collected by ModuleManager, checked by an internal RequirementsChecker and changes to the requirements state are all signalled from ModuleManager. By connecting the requirements in the welcome modules' Config only to their own configs -- and immediately checking them, which is bad on its own -- we end up with a disconnect between what the ModuleManager says about requirements, and what the welcome modules report on. --- src/modules/welcome/WelcomeViewStep.cpp | 4 ++-- src/modules/welcomeq/WelcomeQmlViewStep.cpp | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/modules/welcome/WelcomeViewStep.cpp b/src/modules/welcome/WelcomeViewStep.cpp index e4e56c44c..0ed887fa9 100644 --- a/src/modules/welcome/WelcomeViewStep.cpp +++ b/src/modules/welcome/WelcomeViewStep.cpp @@ -111,12 +111,12 @@ WelcomeViewStep::setConfigurationMap( const QVariantMap& configurationMap ) && configurationMap.value( "requirements" ).type() == QVariant::Map ) { m_requirementsChecker->setConfigurationMap( configurationMap.value( "requirements" ).toMap() ); - - m_conf->requirementsModel().setRequirementsList( checkRequirements() ); } else + { cWarning() << "no valid requirements map found in welcome " "module configuration."; + } //here init the qml or qwidgets needed bits m_widget->init(); diff --git a/src/modules/welcomeq/WelcomeQmlViewStep.cpp b/src/modules/welcomeq/WelcomeQmlViewStep.cpp index 4869673bb..f520a9953 100644 --- a/src/modules/welcomeq/WelcomeQmlViewStep.cpp +++ b/src/modules/welcomeq/WelcomeQmlViewStep.cpp @@ -102,8 +102,6 @@ WelcomeQmlViewStep::setConfigurationMap( const QVariantMap& configurationMap ) && configurationMap.value( "requirements" ).type() == QVariant::Map ) { m_requirementsChecker->setConfigurationMap( configurationMap.value( "requirements" ).toMap() ); - - m_config->requirementsModel().setRequirementsList( checkRequirements() ); } else cWarning() << "no valid requirements map found in welcome "