kwalletmanager: fix build for session-less qtbase

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2015-10-11 21:17:55 +02:00
parent ceb1121bb2
commit 66230a7416
2 changed files with 38 additions and 0 deletions

View File

@@ -0,0 +1,37 @@
From 6ec28a23f2850f6e06e3637b8af2bb956f5a448b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sun, 11 Oct 2015 18:21:50 +0200
Subject: [PATCH] fix build with QT_NO_SESSIONMANAGER set
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
src/manager/kwalletmanager.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/manager/kwalletmanager.cpp b/src/manager/kwalletmanager.cpp
index 64a90dd..6ff9c88 100644
--- a/src/manager/kwalletmanager.cpp
+++ b/src/manager/kwalletmanager.cpp
@@ -101,12 +101,14 @@ void KWalletManager::configUI() {
break;
}
}
+#ifndef QT_NO_SESSIONMANAGER
if (!isOpen && qApp->isSessionRestored()) {
delete _tray;
_tray = 0;
QTimer::singleShot(0, qApp, SLOT(quit()));
return;
}
+#endif
} else {
_tray = 0;
}
--
2.1.0

View File

@@ -25,6 +25,7 @@ DEPENDS += " \
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "93e4ef5baa2c95cbb49c3adeb2baefd7"
SRC_URI[sha256sum] = "6713ee6fc37e50061be3caef2adae5fe4fb0a96717b9d0abb61d3f4e9f8a6ec5"
SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
FILES_${PN} += " \
${datadir}/dbus-1 \