|
|
@ -211,6 +211,36 @@ void
|
|
|
|
RequirementsChecker::setConfigurationMap( const QVariantMap& configurationMap )
|
|
|
|
RequirementsChecker::setConfigurationMap( const QVariantMap& configurationMap )
|
|
|
|
{
|
|
|
|
{
|
|
|
|
bool incompleteConfiguration = false;
|
|
|
|
bool incompleteConfiguration = false;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if ( configurationMap.contains( "check" ) &&
|
|
|
|
|
|
|
|
configurationMap.value( "check" ).type() == QVariant::List )
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
m_entriesToCheck.clear();
|
|
|
|
|
|
|
|
m_entriesToCheck.append( configurationMap.value( "check" ).toStringList() );
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
cDebug() << "WARNING: RequirementsChecker entry 'check' is incomplete.";
|
|
|
|
|
|
|
|
incompleteConfiguration = true;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if ( configurationMap.contains( "required" ) &&
|
|
|
|
|
|
|
|
configurationMap.value( "required" ).type() == QVariant::List )
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
m_entriesToRequire.clear();
|
|
|
|
|
|
|
|
m_entriesToRequire.append( configurationMap.value( "required" ).toStringList() );
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
cDebug() << "WARNING: RequirementsChecker entry 'required' is incomplete.";
|
|
|
|
|
|
|
|
incompleteConfiguration = true;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Help out with consistency, but don't fix
|
|
|
|
|
|
|
|
for ( const auto& r : m_entriesToRequire )
|
|
|
|
|
|
|
|
if ( !m_entriesToCheck.contains( r ) )
|
|
|
|
|
|
|
|
cDebug() << "WARNING: RequirementsChecker requires" << r << "but does not check it.";
|
|
|
|
|
|
|
|
|
|
|
|
if ( configurationMap.contains( "requiredStorage" ) &&
|
|
|
|
if ( configurationMap.contains( "requiredStorage" ) &&
|
|
|
|
( configurationMap.value( "requiredStorage" ).type() == QVariant::Double ||
|
|
|
|
( configurationMap.value( "requiredStorage" ).type() == QVariant::Double ||
|
|
|
|
configurationMap.value( "requiredStorage" ).type() == QVariant::Int ) )
|
|
|
|
configurationMap.value( "requiredStorage" ).type() == QVariant::Int ) )
|
|
|
@ -274,30 +304,6 @@ RequirementsChecker::setConfigurationMap( const QVariantMap& configurationMap )
|
|
|
|
incompleteConfiguration = true;
|
|
|
|
incompleteConfiguration = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if ( configurationMap.contains( "check" ) &&
|
|
|
|
|
|
|
|
configurationMap.value( "check" ).type() == QVariant::List )
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
m_entriesToCheck.clear();
|
|
|
|
|
|
|
|
m_entriesToCheck.append( configurationMap.value( "check" ).toStringList() );
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
cDebug() << "WARNING: RequirementsChecker entry 'check' is incomplete.";
|
|
|
|
|
|
|
|
incompleteConfiguration = true;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if ( configurationMap.contains( "required" ) &&
|
|
|
|
|
|
|
|
configurationMap.value( "required" ).type() == QVariant::List )
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
m_entriesToRequire.clear();
|
|
|
|
|
|
|
|
m_entriesToRequire.append( configurationMap.value( "required" ).toStringList() );
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
cDebug() << "WARNING: RequirementsChecker entry 'required' is incomplete.";
|
|
|
|
|
|
|
|
incompleteConfiguration = true;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if ( incompleteConfiguration )
|
|
|
|
if ( incompleteConfiguration )
|
|
|
|
cDebug() << "WARNING: RequirementsChecker configuration map:\n" << configurationMap;
|
|
|
|
cDebug() << "WARNING: RequirementsChecker configuration map:\n" << configurationMap;
|
|
|
|
}
|
|
|
|
}
|
|
|
|