Fix an error in daemon-helper

elysia-best · elysia-best · commit 4f2ee85cb748 · 2024-11-16T20:39:21.000+08:00
diff --git a/session/application.cpp b/session/application.cpp
@@ -106,6 +106,13 @@ Application::Application(int& argc, char** argv)
 
     m_wayland = parser.isSet(waylandOption);
 
+    if (m_wayland) {
+        qputenv("XDG_SESSION_TYPE", "wayland");
+        qputenv("QT_QPA_PLATFORM", "wayland");
+    } else {
+        qputenv("QT_QPA_PLATFORM", QByteArrayLiteral("xcb"));
+    }
+
     createConfigDirectory();
     initKWinConfig();
     initLanguage();
diff --git a/session/daemon-helper.cpp b/session/daemon-helper.cpp
@@ -49,8 +49,9 @@ void Daemon::startProcess(const QPair<QString, QStringList> &processInfo) {
 
   auto xcb_extra = QProcessEnvironment();
   xcb_extra.insert("QT_QPA_PLATFORM", "xcb");
-
-  process->setProcessEnvironment(xcb_extra);
+  auto sys_env = QProcessEnvironment::systemEnvironment();
+  sys_env.insert(xcb_extra);
+  process->setProcessEnvironment(sys_env);
   process->start(processInfo.first, processInfo.second);
   if (process->waitForStarted()) {
     qDebug() << "Process started:" << processInfo.first << "PID:" << process->processId();
diff --git a/settings-daemon/translations/ar_AA.ts b/settings-daemon/translations/ar_AA.ts
@@ -79,7 +79,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/be_BY.ts b/settings-daemon/translations/be_BY.ts
@@ -79,7 +79,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/be_Latn.ts b/settings-daemon/translations/be_Latn.ts
@@ -79,7 +79,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/bg_BG.ts b/settings-daemon/translations/bg_BG.ts
@@ -79,7 +79,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/bs_BA.ts b/settings-daemon/translations/bs_BA.ts
@@ -79,7 +79,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/cs_CZ.ts b/settings-daemon/translations/cs_CZ.ts
@@ -79,7 +79,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/da_DK.ts b/settings-daemon/translations/da_DK.ts
@@ -79,7 +79,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/de_DE.ts b/settings-daemon/translations/de_DE.ts
@@ -79,7 +79,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/en_US.ts b/settings-daemon/translations/en_US.ts
@@ -55,7 +55,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/eo_XX.ts b/settings-daemon/translations/eo_XX.ts
@@ -79,7 +79,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/es_ES.ts b/settings-daemon/translations/es_ES.ts
@@ -79,7 +79,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/es_MX.ts b/settings-daemon/translations/es_MX.ts
@@ -55,7 +55,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/fa_IR.ts b/settings-daemon/translations/fa_IR.ts
@@ -79,7 +79,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/fi_FI.ts b/settings-daemon/translations/fi_FI.ts
@@ -79,7 +79,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/fr_FR.ts b/settings-daemon/translations/fr_FR.ts
@@ -79,7 +79,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/he_IL.ts b/settings-daemon/translations/he_IL.ts
@@ -79,7 +79,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/hi_IN.ts b/settings-daemon/translations/hi_IN.ts
@@ -79,7 +79,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/hu_HU.ts b/settings-daemon/translations/hu_HU.ts
@@ -79,7 +79,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/id_ID.ts b/settings-daemon/translations/id_ID.ts
@@ -79,7 +79,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/ie.ts b/settings-daemon/translations/ie.ts
@@ -79,7 +79,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/it_IT.ts b/settings-daemon/translations/it_IT.ts
@@ -55,7 +55,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/ja_JP.ts b/settings-daemon/translations/ja_JP.ts
@@ -79,7 +79,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/lt_LT.ts b/settings-daemon/translations/lt_LT.ts
@@ -79,7 +79,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/lv_LV.ts b/settings-daemon/translations/lv_LV.ts
@@ -79,7 +79,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/mg.ts b/settings-daemon/translations/mg.ts
@@ -79,7 +79,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/ml_IN.ts b/settings-daemon/translations/ml_IN.ts
@@ -79,7 +79,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/nb_NO.ts b/settings-daemon/translations/nb_NO.ts
@@ -79,7 +79,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/ne_NP.ts b/settings-daemon/translations/ne_NP.ts
@@ -79,7 +79,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/pl_PL.ts b/settings-daemon/translations/pl_PL.ts
@@ -80,7 +80,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/pt_BR.ts b/settings-daemon/translations/pt_BR.ts
@@ -55,7 +55,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/pt_PT.ts b/settings-daemon/translations/pt_PT.ts
@@ -79,7 +79,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/ro_RO.ts b/settings-daemon/translations/ro_RO.ts
@@ -79,7 +79,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/ru_RU.ts b/settings-daemon/translations/ru_RU.ts
@@ -79,7 +79,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/si_LK.ts b/settings-daemon/translations/si_LK.ts
@@ -79,7 +79,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/sk_SK.ts b/settings-daemon/translations/sk_SK.ts
@@ -79,7 +79,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/so.ts b/settings-daemon/translations/so.ts
@@ -79,7 +79,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/sr_RS.ts b/settings-daemon/translations/sr_RS.ts
@@ -79,7 +79,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/sv_SE.ts b/settings-daemon/translations/sv_SE.ts
@@ -79,7 +79,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/sw.ts b/settings-daemon/translations/sw.ts
@@ -79,7 +79,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/ta_IN.ts b/settings-daemon/translations/ta_IN.ts
@@ -79,7 +79,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/tr_TR.ts b/settings-daemon/translations/tr_TR.ts
@@ -79,7 +79,7 @@
 <context>
     <name>ThemeManager</name>
     <message>
-        <location filename="../theme/thememanager.cpp" line="293"/>
+        <location filename="../theme/thememanager.cpp" line="294"/>
         <source>Screen scaling needs to be re-login to take effect</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/settings-daemon/translations/uk_UA.ts b/settings-daemon/translations/uk_UA.ts
diff --git a/settings-daemon/translations/uz_UZ.ts b/settings-daemon/translations/uz_UZ.ts
diff --git a/settings-daemon/translations/vi_VN.ts b/settings-daemon/translations/vi_VN.ts
diff --git a/settings-daemon/translations/zh_CN.ts b/settings-daemon/translations/zh_CN.ts
diff --git a/settings-daemon/translations/zh_TW.ts b/settings-daemon/translations/zh_TW.ts
