kdiamond: fix build for session-less qtbase
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
@@ -0,0 +1,38 @@
|
||||
From cb9bb7f24cd21fb0fa1742a4316ad489f6c8cf6d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Sun, 11 Oct 2015 21:24:16 +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/main.cpp | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/main.cpp b/src/main.cpp
|
||||
index b27de6f..556fb16 100644
|
||||
--- a/src/main.cpp
|
||||
+++ b/src/main.cpp
|
||||
@@ -70,10 +70,14 @@ int main(int argc, char **argv)
|
||||
KgDifficultyLevel::VeryHard
|
||||
);
|
||||
KDBusService service;
|
||||
+#ifndef QT_NO_SESSIONMANAGER
|
||||
// see if we are starting with session management
|
||||
if (app.isSessionRestored()) {
|
||||
RESTORE(MainWindow);
|
||||
- } else {
|
||||
+ }
|
||||
+ else
|
||||
+#endif
|
||||
+ {
|
||||
MainWindow *window = new MainWindow;
|
||||
window->show();
|
||||
}
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@@ -26,6 +26,7 @@ DEPENDS += "\
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "1bfc2a77d358a34aa84202bdf09ac9c0"
|
||||
SRC_URI[sha256sum] = "f53f152c9891a1e6de29f0d74b29806d36518868ec5ab0cbcaf1666eafa101b9"
|
||||
SRC_URI+="file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/k*5 \
|
||||
|
||||
Reference in New Issue
Block a user