pool/plasma5-workspace
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=177

Browse Source
This commit is contained in:
Hrvoje Senjan 2016-02-26 15:09:51 +00:00 committed by Git OBS Bridge
parent e0f36a6175
commit 63f12fa7e3
2 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plasma5-workspace.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Feb 26 15:09:14 UTC 2016 - hrvoje.senjan@gmail.com
- Update plasmashell-disable-windowclosing-on-logout.patch to
upstream version (but apply it for Qt >= 5.5.1)
-------------------------------------------------------------------
Thu Feb 25 21:52:23 UTC 2016 - hrvoje.senjan@gmail.com

40
plasmashell-disable-windowclosing-on-logout.patch
View File

@ -1,3 +1,41 @@
From: Andreas Hartmetz <ahartmetz@gmail.com>
Date: Sat, 20 Feb 2016 20:01:42 +0000
Subject: Disable fallback session management (requires Qt >= 5.6.0).
X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=b5e814a7b2867914327c889794b1088027aaafd6
---
Disable fallback session management (requires Qt >= 5.6.0).
This prevents processes from dying when session logout is cancelled.
Session restore is not an issue in these, it's disabled anyway.
---
--- a/klipper/main.cpp
+++ b/klipper/main.cpp
@@ -73,6 +73,9 @@
KAboutData::setApplicationData(aboutData);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 1)
+ QGuiApplication::setFallbackSessionManagementEnabled(false);
+#endif
auto disableSessionManagement = [](QSessionManager &sm) {
sm.setRestartHint(QSessionManager::RestartNever);
};
--- a/krunner/main.cpp
+++ b/krunner/main.cpp
@@ -66,6 +66,9 @@
KAboutData::setApplicationData(aboutData);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 1)
+ QGuiApplication::setFallbackSessionManagementEnabled(false);
+#endif
auto disableSessionManagement = [](QSessionManager &sm) {
sm.setRestartHint(QSessionManager::RestartNever);
};
diff --git a/shell/main.cpp b/shell/main.cpp
index 49ea484..68cf9e9 100644
--- a/shell/main.cpp
@ -6,7 +44,7 @@ index 49ea484..68cf9e9 100644
};
QObject::connect(&app, &QGuiApplication::commitDataRequest, disableSessionManagement);
QObject::connect(&app, &QGuiApplication::saveStateRequest, disableSessionManagement);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 1)
+ QGuiApplication::setFallbackSessionManagementEnabled(false);
+#endif