Commit 65a340f2 authored by Kai Uwe Broulik's avatar Kai Uwe Broulik 🍇
Browse files

Merge branch 'Plasma/5.12' into Plasma/5.18

parents 093e2d91 fc668c55
......@@ -202,7 +202,7 @@ bool Attica::KdePlatformDependent::askForCredentials(const QUrl& baseUrl, QStrin
QList<QUrl> KdePlatformDependent::getDefaultProviderFiles() const
{
KConfigGroup group(m_config, "General");
QStringList pathStrings = group.readPathEntry("providerFiles", QStringList(QStringLiteral("https://download.kde.org/ocs/providers.xml")));
QStringList pathStrings = group.readPathEntry("providerFiles", QStringList(QStringLiteral("https://autoconfig.kde.org/ocs/providers.xml")));
QList<QUrl> paths;
foreach (const QString& pathString, pathStrings) {
paths.append(QUrl(pathString));
......@@ -214,7 +214,7 @@ QList<QUrl> KdePlatformDependent::getDefaultProviderFiles() const
void KdePlatformDependent::addDefaultProviderFile(const QUrl& url)
{
KConfigGroup group(m_config, "General");
QStringList pathStrings = group.readPathEntry("providerFiles", QStringList(QStringLiteral("https://download.kde.org/ocs/providers.xml")));
QStringList pathStrings = group.readPathEntry("providerFiles", QStringList(QStringLiteral("https://autoconfig.kde.org/ocs/providers.xml")));
QString urlString = url.toString();
if(!pathStrings.contains(urlString)) {
pathStrings.append(urlString);
......@@ -227,7 +227,7 @@ void KdePlatformDependent::addDefaultProviderFile(const QUrl& url)
void KdePlatformDependent::removeDefaultProviderFile(const QUrl& url)
{
KConfigGroup group(m_config, "General");
QStringList pathStrings = group.readPathEntry("providerFiles", QStringList(QStringLiteral("https://download.kde.org/ocs/providers.xml")));
QStringList pathStrings = group.readPathEntry("providerFiles", QStringList(QStringLiteral("https://autoconfig.kde.org/ocs/providers.xml")));
pathStrings.removeAll(url.toString());
group.writeEntry("providerFiles", pathStrings);
}
......
......@@ -41,7 +41,7 @@ Name[x-test]=xxColor Schemesxx
Name[zh_CN]=配色方案
Name[zh_TW]=配色
ProvidersUrl=https://download.kde.org/ocs/providers.xml
ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml
TargetDir=color-schemes
Uncompress=archive
Categories=KDE Color Scheme KDE4
......
......@@ -43,7 +43,7 @@ Name[x-test]=xxCursorsxx
Name[zh_CN]=光标
Name[zh_TW]=游標
ProvidersUrl=https://download.kde.org/ocs/providers.xml
ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml
Categories=X11 Mouse Theme
InstallPath=.icons
Uncompress=always
......@@ -32,7 +32,7 @@ Name[x-test]=xxPlasma Stylesxx
Name[zh_CN]=Plasma 样式
Name[zh_TW]=Plasma 樣式
ProvidersUrl=https://download.kde.org/ocs/providers.xml
ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml
Categories=Plasma Theme
StandardResource=tmp
InstallationCommand=kpackagetool5 -t Plasma/Theme -i %f
......
......@@ -84,7 +84,7 @@ Name[x-test]=xxEmoticonsxx
Name[zh_CN]=表情符号
Name[zh_TW]=表情圖示
ProvidersUrl=https://download.kde.org/ocs/providers.xml
ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml
Categories=Emoticon Theme
TargetDir=emoticons
Uncompress=always
......@@ -92,7 +92,7 @@ Name[x-test]=xxIconsxx
Name[zh_CN]=图标
Name[zh_TW]=圖示
ProvidersUrl=https://download.kde.org/ocs/providers.xml
ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml
Categories=KDE Icon Theme
TargetDir=icons
Uncompress=true
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment