Merge branch 'master' into requirements-checking

This commit is contained in:
Adriaan de Groot 2018-03-06 17:06:35 +01:00
commit c7629182e4
229 changed files with 20045 additions and 6562 deletions

View file

@ -128,7 +128,7 @@ WelcomeViewStep::setConfigurationMap( const QVariantMap& configurationMap )
configurationMap.value( "requirements" ).type() == QVariant::Map )
m_requirementsChecker->setConfigurationMap( configurationMap.value( "requirements" ).toMap() );
else
cDebug() << "WARNING: no valid requirements map found in welcome "
cWarning() << "no valid requirements map found in welcome "
"module configuration.";
}