41 lines
1.0 KiB
Diff
41 lines
1.0 KiB
Diff
From d83637a54457d77687088f45a9036b9a2a7bcf11 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
|
Date: Fri, 24 Apr 2015 11:35:45 +0200
|
|
Subject: [PATCH] fix build for qtbase build without session support
|
|
QT_NO_SESSIONMANAGER
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
|
---
|
|
src/main.cpp | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/main.cpp b/src/main.cpp
|
|
index 2463a29..1709717 100644
|
|
--- a/src/main.cpp
|
|
+++ b/src/main.cpp
|
|
@@ -78,6 +78,7 @@ int main(int argc, char *argv[])
|
|
options.process(app);
|
|
about.processCommandLine(&options);
|
|
|
|
+#ifndef QT_NO_SESSIONMANAGER
|
|
if (!app.isSessionRestored()) {
|
|
MainWindow *mw = new MainWindow();
|
|
|
|
@@ -89,7 +90,9 @@ int main(int argc, char *argv[])
|
|
|
|
mw->show();
|
|
}
|
|
- else RESTORE(MainWindow);
|
|
+ else
|
|
+#endif
|
|
+ RESTORE(MainWindow);
|
|
|
|
return app.exec();
|
|
}
|
|
--
|
|
1.9.3
|
|
|