Remove X-Plasma-MainScript keys and rename files if needed

2026-11-03 22:59:45 -09:00 · 2023-10-01 10:25:37 +02:00 · 2023-10-01 10:25:37 +02:00 · 866e815eb2
commit 866e815eb2
parent f82371c7c5
30 changed files with 12 additions and 36 deletions
--- a/applets/activitypager/metadata.json
+++ b/applets/activitypager/metadata.json
@ -149,7 +149,6 @@
        "Website": "https://userbase.kde.org"
    },
    "X-Plasma-API": "declarativeappletscript",
-    "X-Plasma-MainScript": "ui/main.qml",
    "X-Plasma-Provides": [
        "org.kde.plasma.virtualdesktops",
        "org.kde.plasma.activities"
--- a/applets/icontasks/metadata.json
+++ b/applets/icontasks/metadata.json
@ -160,7 +160,6 @@
        "Website": "https://userbase.kde.org/Plasma/Tasks"
    },
    "X-Plasma-API": "declarativeappletscript",
-    "X-Plasma-MainScript": "ui/main.qml",
    "X-Plasma-Provides": [
        "org.kde.plasma.multitasking"
    ],
--- a/applets/keyboardlayout/metadata.json
+++ b/applets/keyboardlayout/metadata.json
@ -189,7 +189,6 @@
        "Website": "https://kde.org/plasma-desktop/"
    },
    "X-Plasma-API": "declarativeappletscript",
-    "X-Plasma-MainScript": "ui/main.qml",
    "X-Plasma-NotificationArea": "true",
    "X-Plasma-NotificationAreaCategory": "Hardware"
 }
--- a/applets/kicker/package/metadata.json
+++ b/applets/kicker/package/metadata.json
@ -163,7 +163,6 @@
        "Version": "2.0"
    },
    "X-Plasma-API": "declarativeappletscript",
-    "X-Plasma-MainScript": "ui/main.qml",
    "X-Plasma-Provides": [
        "org.kde.plasma.launchermenu"
    ]
--- a/applets/kickoff/package/contents/ui/Kickoff.qml
+++ b/applets/kickoff/package/contents/ui/Kickoff.qml
--- a/applets/kickoff/package/metadata.json
+++ b/applets/kickoff/package/metadata.json
@ -243,7 +243,6 @@
        "Website": "https://userbase.kde.org/Plasma/Kickoff"
    },
    "X-Plasma-API": "declarativeappletscript",
-    "X-Plasma-MainScript": "ui/Kickoff.qml",
    "X-Plasma-Provides": [
        "org.kde.plasma.launchermenu"
    ]
--- a/applets/kimpanel/package/metadata.json
+++ b/applets/kimpanel/package/metadata.json
@ -203,6 +203,5 @@
    "Keywords[x-test]": "xxInputxx;xxIMxx;",
    "Keywords[zh_CN]": "Input;IM;输入法;输入;",
    "Keywords[zh_TW]": "Input;IM;",
-    "X-Plasma-API": "declarativeappletscript",
-    "X-Plasma-MainScript": "ui/main.qml"
+    "X-Plasma-API": "declarativeappletscript"
 }
--- a/applets/margins-separator/metadata.json
+++ b/applets/margins-separator/metadata.json
@ -179,6 +179,5 @@
    "Keywords[x-test]": "xxseparatorxx",
    "Keywords[zh_CN]": "separator,分隔符,分割",
    "Keywords[zh_TW]": "分隔線",
-    "X-Plasma-API": "declarativeappletscript",
-    "X-Plasma-MainScript": "ui/main.qml"
+    "X-Plasma-API": "declarativeappletscript"
 }
--- a/applets/minimizeall/package/metadata.json
+++ b/applets/minimizeall/package/metadata.json
@ -154,7 +154,6 @@
        "Website": "https://kde.org/plasma-desktop"
    },
    "X-Plasma-API": "declarativeappletscript",
-    "X-Plasma-MainScript": "ui/main.qml",
    "X-Plasma-Provides": [
        "org.kde.plasma.windowmanagement"
    ],
--- a/applets/pager/package/metadata.json
+++ b/applets/pager/package/metadata.json
@ -195,7 +195,6 @@
        "Website": "https://userbase.kde.org/Plasma/Pager"
    },
    "X-Plasma-API": "declarativeappletscript",
-    "X-Plasma-MainScript": "ui/main.qml",
    "X-Plasma-Provides": [
        "org.kde.plasma.virtualdesktops"
    ]
--- a/applets/showActivityManager/package/metadata.json
+++ b/applets/showActivityManager/package/metadata.json
@ -173,7 +173,6 @@
        "Website": "https://www.kde.org/plasma-desktop"
    },
    "X-Plasma-API": "declarativeappletscript",
-    "X-Plasma-MainScript": "ui/main.qml",
    "X-Plasma-Provides": [
        "org.kde.plasma.activities"
    ]
--- a/applets/showdesktop/package/metadata.json
+++ b/applets/showdesktop/package/metadata.json
@ -147,7 +147,6 @@
        "Website": "https://kde.org/plasma-desktop"
    },
    "X-Plasma-API": "declarativeappletscript",
-    "X-Plasma-MainScript": "ui/main.qml",
    "X-Plasma-Provides": [
        "org.kde.plasma.windowmanagement"
    ]
--- a/applets/taskmanager/package/metadata.json
+++ b/applets/taskmanager/package/metadata.json
@ -188,7 +188,6 @@
        "Website": "https://userbase.kde.org/Plasma/Tasks"
    },
    "X-Plasma-API": "declarativeappletscript",
-    "X-Plasma-MainScript": "ui/main.qml",
    "X-Plasma-Provides": [
        "org.kde.plasma.multitasking"
    ]
--- a/applets/trash/package/metadata.json
+++ b/applets/trash/package/metadata.json
@ -191,7 +191,6 @@
    "X-Plasma-DropUrlPatterns": [
        "trash:/"
    ],
-    "X-Plasma-MainScript": "ui/main.qml",
    "X-Plasma-Provides": [
        "org.kde.plasma.trash"
    ]
--- a/applets/window-list/metadata.json
+++ b/applets/window-list/metadata.json
@ -138,7 +138,6 @@
        "Website": "https://kde.org/plasma-desktop"
    },
    "X-Plasma-API": "declarativeappletscript",
-    "X-Plasma-MainScript": "ui/main.qml",
    "X-Plasma-Provides": [
        "org.kde.plasma.multitasking"
    ]
--- a/containments/desktop/package/metadata.json
+++ b/containments/desktop/package/metadata.json
@ -246,6 +246,5 @@
        "Website": "https://www.kde.org/plasma-desktop"
    },
    "X-Plasma-API": "declarativeappletscript",
-    "X-Plasma-ContainmentType": "Desktop",
-    "X-Plasma-MainScript": "ui/main.qml"
+    "X-Plasma-ContainmentType": "Desktop"
 }
--- a/containments/folder/metadata.json
+++ b/containments/folder/metadata.json
@ -165,7 +165,6 @@
    "X-Plasma-DropMimeTypes": [
        "inode/directory"
    ],
-    "X-Plasma-MainScript": "ui/main.qml",
    "X-Plasma-Provides": [
        "org.kde.plasma.filemanagement"
    ],
--- a/containments/panel/metadata.json
+++ b/containments/panel/metadata.json
@ -130,6 +130,5 @@
    "Keywords": "",
    "NoDisplay": true,
    "X-Plasma-API": "declarativeappletscript",
-    "X-Plasma-ContainmentType": "Panel",
-    "X-Plasma-MainScript": "ui/main.qml"
+    "X-Plasma-ContainmentType": "Panel"
 }
--- a/desktoppackage/contents/layout.js
+++ b/desktoppackage/contents/layout.js
--- a/desktoppackage/metadata.json
+++ b/desktoppackage/metadata.json
@ -195,6 +195,5 @@
        "Website": "https://www.kde.org/plasma-desktop"
    },
    "Keywords": "",
-    "X-KDE-ParentApp": "org.kde.plasmashell",
-    "X-Plasma-MainScript": "layout.js"
+    "X-KDE-ParentApp": "org.kde.plasmashell"
 }
--- a/kcms/componentchooser/kcm_componentchooser.json
+++ b/kcms/componentchooser/kcm_componentchooser.json
@ -173,6 +173,5 @@
    "X-KDE-Keywords[x-test]": "xxdefault applicationsxx,xxdefault appsxx,xxcomponentsxx,xxcomponent chooserxx,xxresourcesxx,xxweb browserxx,xxbrowserxx,xxinternetxx,xxfile managerxx,xxdolphinxx,xxemailxx,xxe-mailxx,xxemail clientxx,xxterminalxx,xxterminal emulatorxx,xxkonsolexx,xxdefaultsxx,xxopen withxx,xxfile associationxx",
    "X-KDE-Keywords[zh_CN]": "default applications,default apps,components,component chooser,resources,web browser,browser,internet,file manager,dolphin,email,e-mail,email client,terminal,terminal emulator,konsole,defaults,open with,file association,默认应用程序,默认应用,组件,组件选择器,资源,网页浏览器,浏览器,互联网,文件管理器,电子邮件,电子邮件客户端,终端,终端模拟器,默认,打开方式,使用其他应用打开,文件关联",
    "X-KDE-System-Settings-Parent-Category": "applications-defaults",
-    "X-KDE-Weight": 10,
-    "X-Plasma-MainScript": "ui/main.qml"
+    "X-KDE-Weight": 10
 }
--- a/kcms/keyboard/x11_helper.h
+++ b/kcms/keyboard/x11_helper.h
@ -13,6 +13,7 @@
 #include <QWidget>
 #include <QtGui/private/qtx11extras_p.h>

+QT_WARNING_DISABLE_CLANG("-Wkeyword-macro")
 #define explicit explicit_is_keyword_in_cpp
 #include <xcb/xcb.h>
 #include <xcb/xkb.h>
--- a/kcms/ksmserver/kcm_smserver.json
+++ b/kcms/ksmserver/kcm_smserver.json
@ -136,6 +136,5 @@
    "X-KDE-Keywords[x-test]": "xxksmserverxx,xxsessionxx,xxloginxx,xxlogoutxx,xxconfirmationxx,xxsavexx,xxrestorexx,xxefixx,xxuefixx,xxbiosxx,xxhibernatexx,xxshutdownxx,xxrebootxx,xxsave appsxx,xxstartupxx,xxstart-upxx,xxstartxx,xxfirmwarexx",
    "X-KDE-Keywords[zh_CN]": "ksmserver,session,login,logout,confirmation,save,restore,efi,uefi,bios,hibernate,shutdown,reboot,save apps,startup,start-up,start,firmware,会话,登录,注销,确认,保存,恢复,休眠,关机,重启,保存应用,保存应用程序,启动,固件",
    "X-KDE-System-Settings-Parent-Category": "session",
-    "X-KDE-Weight": 60,
-    "X-Plasma-MainScript": "ui/main.qml"
+    "X-KDE-Weight": 60
 }
--- a/kcms/tablet/kcm_tablet.json
+++ b/kcms/tablet/kcm_tablet.json
@ -69,6 +69,5 @@
        "wayland"
    ],
    "X-KDE-System-Settings-Parent-Category": "input-devices",
-    "X-Plasma-API": "declarativeappletscript",
-    "X-Plasma-MainScript": "ui/main.qml"
+    "X-Plasma-API": "declarativeappletscript"
 }
--- a/kcms/touchpad/applet/qml/contents/ui/touchpad.qml
+++ b/kcms/touchpad/applet/qml/contents/ui/touchpad.qml
--- a/kcms/touchpad/applet/qml/metadata.json
+++ b/kcms/touchpad/applet/qml/metadata.json
@ -206,7 +206,6 @@
    "X-Plasma-ConfigPlugins": [
        "kcm_touchpad"
    ],
-    "X-Plasma-MainScript": "ui/touchpad.qml",
    "X-Plasma-NotificationArea": "true",
    "X-Plasma-NotificationAreaCategory": "Hardware"
 }
--- a/kcms/touchscreen/kcm_touchscreen.json
+++ b/kcms/touchscreen/kcm_touchscreen.json
@ -53,6 +53,5 @@
        "wayland"
    ],
    "X-KDE-System-Settings-Parent-Category": "hardware-input-touchscreen",
-    "X-KDE-Weight": 10,
-    "X-Plasma-MainScript": "ui/main.qml"
+    "X-KDE-Weight": 10
 }
--- a/toolboxes/desktoptoolbox/contents/ui/ToolBoxRoot.qml
+++ b/toolboxes/desktoptoolbox/contents/ui/ToolBoxRoot.qml
--- a/toolboxes/desktoptoolbox/metadata.json
+++ b/toolboxes/desktoptoolbox/metadata.json
@ -160,6 +160,5 @@
        "Version": "0.1",
        "Website": "https://www.kde.org/plasma-desktop"
    },
-    "X-Plasma-API": "declarativeappletscript",
-    "X-Plasma-MainScript": "ui/ToolBoxRoot.qml"
+    "X-Plasma-API": "declarativeappletscript"
 }
--- a/toolboxes/paneltoolbox/metadata.json
+++ b/toolboxes/paneltoolbox/metadata.json
@ -162,6 +162,5 @@
        "Name[zh_TW]": "面板工具盒",
        "Version": "0.1",
        "Website": "https://www.kde.org/plasma-desktop"
-    },
-    "X-Plasma-MainScript": "ui/main.qml"
+    }
 }