diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-03-07 16:53:34 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-03-07 17:08:56 +0100 |
| commit | f93032848e6b090b671d0035557a32bed65d2b4e (patch) | |
| tree | 8cb6a0705c19d3cc6002f70ed5dddd0dd7adcab9 /src/gui/kernel/qguiapplication_p.h | |
| parent | bcd88d8e9984bff664740aae3cff708a069dbbdd (diff) | |
| parent | d0cdc7ad1e2728caf363abf328b2ad81f2ed5a5b (diff) | |
Merge remote-tracking branch 'origin/5.6.0' into 5.7v5.7.0-alpha1
Change-Id: Idcda6d52266f557ce4a819b6669f6797473a48a2
Diffstat (limited to 'src/gui/kernel/qguiapplication_p.h')
| -rw-r--r-- | src/gui/kernel/qguiapplication_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h index e7c0501521..c1efb5c0c0 100644 --- a/src/gui/kernel/qguiapplication_p.h +++ b/src/gui/kernel/qguiapplication_p.h @@ -248,6 +248,7 @@ public: #endif #ifndef QT_NO_SESSIONMANAGER + static bool is_fallback_session_management_enabled; QSessionManager *session_manager; bool is_session_restored; bool is_saving_session; |