kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-10-28 03:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only use KStartupInfo on X11

Browse source
This commit is contained in:
Nicolas Fella 2023-05-31 14:13:19 +02:00
parent 5b301819fa
commit 1c393f50d5
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/dolphinmainwindow.cpp
View file

@ -54,7 +54,6 @@
#include <KShell> #include <KShell>
#include <KShortcutsDialog> #include <KShortcutsDialog>
#include <KStandardAction> #include <KStandardAction>
#include <KStartupInfo>
#include <KSycoca> #include <KSycoca>
#include <KTerminalLauncherJob> #include <KTerminalLauncherJob>
#include <KToggleAction> #include <KToggleAction>
@ -84,6 +83,10 @@
#include <algorithm> #include <algorithm>
#if HAVE_X11
#include <KStartupInfo>
#endif
namespace namespace
{ {
// Used for GeneralSettings::version() to determine whether // Used for GeneralSettings::version() to determine whether
@ -305,8 +308,10 @@ void DolphinMainWindow::activateWindow(const QString &activationToken)
if (KWindowSystem::isPlatformWayland()) { if (KWindowSystem::isPlatformWayland()) {
KWindowSystem::setCurrentXdgActivationToken(activationToken); KWindowSystem::setCurrentXdgActivationToken(activationToken);
} else { } else if (KWindowSystem::isPlatformX11()) {
#if HAVE_X11
KStartupInfo::setNewStartupId(window()->windowHandle(), activationToken.toUtf8()); KStartupInfo::setNewStartupId(window()->windowHandle(), activationToken.toUtf8());
#endif
} }
KWindowSystem::activateWindow(window()->windowHandle()); KWindowSystem::activateWindow(window()->windowHandle());