Merge pull request #1491 from asif-mahmud/calamares

[libcalamares] retrieving string list fix

src/libcalamares/utils/Variant.cpp

@@ -67,7 +67,7 @@ getStringList( const QVariantMap& map, const QString& key, const QStringList& d
     if ( map.contains( key ) )
     {
         auto v = map.value( key );
-        if ( v.type() == QVariant::StringList )
+        if ( v.canConvert( QMetaType::QStringList ) )
         {
             return v.toStringList();
         }
@@ -81,7 +81,7 @@ getInteger( const QVariantMap& map, const QString& key, qint64 d )
     if ( map.contains( key ) )
     {
         auto v = map.value( key );
-        return v.toString().toLongLong(nullptr, 0);
+        return v.toString().toLongLong( nullptr, 0 );
     }
     return d;
 }
@@ -92,7 +92,7 @@ getUnsignedInteger( const QVariantMap& map, const QString& key, quint64 d )
     if ( map.contains( key ) )
     {
         auto v = map.value( key );
-        return v.toString().toULongLong(nullptr, 0);
+        return v.toString().toULongLong( nullptr, 0 );
     }
     return d;
 }