Merge branch 'Plasma/5.18'

# Conflicts:
#	CMakeLists.txt
#	kcms/workspaceoptions/kcm_workspace.desktop

desktoppackage/contents/configuration/AppletConfiguration.qml

@@ -164,7 +164,7 @@ Rectangle {
                 id: categoriesScroll
                 QtControls.ScrollBar.horizontal.policy: QtControls.ScrollBar.AlwaysOff
                 Layout.fillHeight: true
-                visible: (configDialog.configModel ? configDialog.configModel.count : 0) + globalConfigModel.count > 1
+                visible: true
                 Layout.maximumWidth: units.gridUnit * 7
                 Layout.preferredWidth: categories.implicitWidth
 

kcms/krdb/krdb.cpp

@@ -752,8 +752,8 @@ void runRdb( uint flags )
 
   // Export the Xcursor theme & size settings
   KConfigGroup mousecfg(KSharedConfig::openConfig( QStringLiteral("kcminputrc") ), "Mouse" );
-  QString theme = mousecfg.readEntry("cursorTheme", QString());
-  QString size  = mousecfg.readEntry("cursorSize", QString());
+  QString theme = mousecfg.readEntry("cursorTheme", QString("breeze_cursors"));
+  QString size  = mousecfg.readEntry("cursorSize", QString("0"));
   QString contents;
 
   if (!theme.isNull())

kcms/standard_actions/standard_actions.desktop

@@ -6,7 +6,6 @@ X-KDE-ServiceTypes=KCModule
 X-DocPath=kcontrol/keys/index.html
 
 X-KDE-Library=kcm_standard_actions
-X-KDE-Init-Symbol=standard_actions
 X-KDE-ParentApp=kcontrol
 
 X-KDE-System-Settings-Parent-Category=shortcuts

toolboxes/desktoptoolbox/contents/ui/ToolBoxButton.qml

@@ -44,6 +44,7 @@ Item {
     }
     transformOrigin: Item.Center
     opacity: plasmoid.editMode
+    visible: plasmoid.editMode
     Behavior on opacity {
         OpacityAnimator {
             duration: units.longDuration

toolboxes/desktoptoolbox/contents/ui/ToolBoxRoot.qml

@@ -54,10 +54,8 @@ Item {
 
     ToolBoxButton {
         id: toolBoxButton
-        visible: false
         Component.onCompleted: {
             placeToolBox(plasmoid.configuration.ToolBoxButtonState);
-            toolBoxButton.visible = true
         }
     }