Merge branch 'Plasma/5.12' into Plasma/5.18

6 years ago · 90ee9ff011
parent 9573fd8c99 7eaf278a7d
commit 90ee9ff011
4 changed files with 5 additions and 2 deletions
--- a/components/shellprivate/widgetexplorer/plasmoids.knsrc
+++ b/components/shellprivate/widgetexplorer/plasmoids.knsrc
@ -44,7 +44,7 @@ Name[x-test]=xxPlasma Widgetsxx
 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 5 Plasmoid
 StandardResource=tmp
 InstallationCommand=kpackagetool5 --install %f --type Plasma/Applet
--- a/dataengines/geolocation/location_ip.cpp
+++ b/dataengines/geolocation/location_ip.cpp
@ -24,6 +24,7 @@
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
+#include <QJsonArray>
 #include <QUrl>
 #include <KJob>
 #include <KIO/Job>
--- a/runners/windows/windowsrunner.cpp
+++ b/runners/windows/windowsrunner.cpp
@ -22,6 +22,8 @@

 #include <QTimer>

+#include <QMutex>
+#include <QMutexLocker>
 #include <QDebug>
 #include <QIcon>
 #include <QMutexLocker>
--- a/wallpapers/image/wallpaper.knsrc.cmake
+++ b/wallpapers/image/wallpaper.knsrc.cmake
@ -41,7 +41,7 @@ Name[x-test]=xxWallpapersxx
 Name[zh_CN]=壁纸
 Name[zh_TW]=桌布

-ProvidersUrl=https://download.kde.org/ocs/providers.xml
+ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml
 Categories=KDE Wallpaper 800x600,KDE Wallpaper 1024x768,KDE Wallpaper 1280x1024,KDE Wallpaper 1440x900,KDE Wallpaper 1600x1200,KDE Wallpaper (other)
 StandardResource=wallpaper
 Uncompress=archive