From 719623a11d57da6a56d069a5ca8161531a37776b Mon Sep 17 00:00:00 2001 From: Andreas Hartmetz Date: Wed, 17 Feb 2016 21:33:25 +0100 Subject: Fix builds without session management. My previous change broke it. Change-Id: I3c3a9a65775032a95eebf3526c1bbf2c50773230 Reviewed-by: Samuli Piippo --- src/gui/kernel/qguiapplication.cpp | 4 ++++ 1 file changed, 4 insertions(+) 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 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 -- cgit v1.2.3