Enable KActivities integration by default in kwin_wayland

This commit is contained in:
Kevin Ottens 2021-03-05 13:52:58 +01:00 committed by Kevin Ottens
parent 41766d3594
commit da0aed5446

View file

@ -624,6 +624,12 @@ int main(int argc, char * argv[])
i18n("Starts the session without global shortcuts support.")); i18n("Starts the session without global shortcuts support."));
parser.addOption(noGlobalShortcutsOption); parser.addOption(noGlobalShortcutsOption);
#ifdef KWIN_BUILD_ACTIVITIES
QCommandLineOption noActivitiesOption(QStringLiteral("no-kactivities"),
i18n("Disable KActivities integration."));
parser.addOption(noActivitiesOption);
#endif
QCommandLineOption exitWithSessionOption(QStringLiteral("exit-with-session"), QCommandLineOption exitWithSessionOption(QStringLiteral("exit-with-session"),
i18n("Exit after the session application, which is started by KWin, closed."), i18n("Exit after the session application, which is started by KWin, closed."),
QStringLiteral("/path/to/session")); QStringLiteral("/path/to/session"));
@ -637,7 +643,9 @@ int main(int argc, char * argv[])
a.processCommandLine(&parser); a.processCommandLine(&parser);
#ifdef KWIN_BUILD_ACTIVITIES #ifdef KWIN_BUILD_ACTIVITIES
if (parser.isSet(noActivitiesOption)) {
a.setUseKActivities(false); a.setUseKActivities(false);
}
#endif #endif
if (parser.isSet(replaceOption)) { if (parser.isSet(replaceOption)) {