summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Hartmetz <ahartmetz@gmail.com>2016-02-17 21:33:25 +0100
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>2016-02-18 07:24:38 +0000
commit719623a11d57da6a56d069a5ca8161531a37776b (patch)
tree4103ac296d86a5851ad410470ebbfa68e5a5df14
parente7bf0edfd49de9a4d8285fbe8d878f8fda910e6d (diff)
Fix builds without session management.v5.6.0-rc1
My previous change broke it. Change-Id: I3c3a9a65775032a95eebf3526c1bbf2c50773230 Reviewed-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
-rw-r--r--src/gui/kernel/qguiapplication.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 8f1c62fbca..95e47e18a9 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -138,7 +138,9 @@ QPlatformTheme *QGuiApplicationPrivate::platform_theme = 0;
QList<QObject *> QGuiApplicationPrivate::generic_plugin_list;
+#ifndef QT_NO_SESSIONMANAGER
bool QGuiApplicationPrivate::is_fallback_session_management_enabled = true;
+#endif
enum ApplicationResourceFlags
{
@@ -3084,6 +3086,7 @@ void QGuiApplicationPrivate::setApplicationState(Qt::ApplicationState state, boo
emit qApp->applicationStateChanged(applicationState);
}
+#ifndef QT_NO_SESSIONMANAGER
// ### Qt6: consider removing the feature or making it less intrusive
/*!
\since 5.6
@@ -3132,6 +3135,7 @@ void QGuiApplication::setFallbackSessionManagementEnabled(bool enabled)
{
QGuiApplicationPrivate::is_fallback_session_management_enabled = enabled;
}
+#endif // QT_NO_SESSIONMANAGER
/*!
\since 4.2