Commit b8f43618 authored by Martin Flöser's avatar Martin Flöser

Disable KActivities integration on Wayland

Once again KActivities causes a delay in the startup of KWin. This is
not the first time it happens, that has been a problem since the start
of the Wayland project.

In the past we added a compile time switch due to that and added a
runtime switch once it stoped freezing (20a9a2a2).
And now it broke again, so let's disable again.

KActivities doesn't make sense on Wayland anyway as there is no activity
support for Wayland windows. Once KActivities is able to be used without
freezing KWin on startup and being able to ensure that it won't break
again we can reenable. But I expect guarantees about that. This must be
ensured by proper autotest support to verify that in future usage of
KActivities in the display manager doesn't freeze it.

This is maintainer decision, due to that no pre-commit review.

CCMAIL: plasma-devel@kde.org
BUG: 388628
parent 0d0a9ebe
......@@ -678,12 +678,6 @@ int main(int argc, char * argv[])
QStringLiteral("/path/to/session"));
parser.addOption(exitWithSessionOption);
#ifdef KWIN_BUILD_ACTIVITIES
QCommandLineOption noActivitiesOption(QStringLiteral("no-kactivities"),
i18n("Disable KActivities integration."));
parser.addOption(noActivitiesOption);
#endif
parser.addPositionalArgument(QStringLiteral("applications"),
i18n("Applications to start once Wayland and Xwayland server are started"),
QStringLiteral("[/path/to/application...]"));
......@@ -692,9 +686,7 @@ int main(int argc, char * argv[])
a.processCommandLine(&parser);
#ifdef KWIN_BUILD_ACTIVITIES
if (parser.isSet(noActivitiesOption)) {
a.setUseKActivities(false);
}
a.setUseKActivities(false);
#endif
if (parser.isSet(listBackendsOption)) {
......
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