Commit 483b30d7 authored by David Edmundson's avatar David Edmundson Committed by David Edmundson
Browse files

[startkde] Move more logic into startplasma-wayland from waylandsession

startplamsa-wayland and startplasma-waylandsession are split so that
anything requiring an X or wayland connection happens in
startplasma-waylandsession anything else can happen in the first binary.

runStartupConfig and setting an env variable can happen before kwin. It
might even fix a bug if kwin used any calls that rely on QLocale.
parent 7cf779db
......@@ -76,6 +76,9 @@ int main(int argc, char** argv)
return 1;
}
setupPlasmaEnvironment();
runStartupConfig();
qputenv("PLASMA_USE_QT_SCALING", "1");
qputenv("XDG_SESSION_TYPE", "wayland");
if (!syncDBusEnvironment()) {
......
......@@ -37,12 +37,9 @@ int main(int argc, char** argv)
//
// * Then ksmserver is started which takes control of the rest of the startup sequence
runStartupConfig();
setupFontDpi();
QScopedPointer<QProcess, KillBeforeDeleter> ksplash(setupKSplash());
qputenv("PLASMA_USE_QT_SCALING", "1");
out << "startplasma-waylandsession: Starting up...";
......
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