Skip to content
Snippets Groups Projects
Commit 71410382 authored by akiraohgaki's avatar akiraohgaki
Browse files

Import user configs

parent 96da4cbe
No related branches found
No related tags found
No related merge requests found
......@@ -112,11 +112,19 @@ QJsonObject XdgUrl::_importDestinations()
QJsonObject XdgUrl::_importArchiveTypes()
{
//QJsonObject archiveTypes;
//QJsonObject appConfigArchiveTypes = _appConfig->get("archive_types");
QJsonObject archiveTypes;
QJsonObject appConfigArchiveTypes = _appConfig->get("archive_types");
QJsonObject userConfigArchiveTypes = _userConfig->get("archive_types");
//return archiveTypes;
return _appConfig->get("archive_types");
archiveTypes = appConfigArchiveTypes;
if (!userConfigArchiveTypes.isEmpty()) {
foreach (const QString key, userConfigArchiveTypes.keys()) {
archiveTypes[key] = userConfigArchiveTypes.value(key);
}
}
return archiveTypes;
}
bool XdgUrl::_installPlasmapkg(const QString &path, const QString &type)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment