whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move ENDSESSION_* compat defines to before they are actually used 

This commit amends 144d33df72.

Change-Id: Ic6bc475c9d8c3bb727ee209dbab437a18e219b6d
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Rolf Eike Beer 2019-06-13 11:05:12 +02:00
parent 0ef6150005
commit 47691260ca
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/corelib/kernel/qcoreapplication_win.cpp
View File

@ -694,6 +694,12 @@ static const char *winPosInsertAfter(quintptr h)
static const char *sessionMgrLogOffOption(uint p)
{
#ifndef ENDSESSION_CLOSEAPP
#define ENDSESSION_CLOSEAPP 0x00000001
#endif
#ifndef ENDSESSION_CRITICAL
#define ENDSESSION_CRITICAL 0x40000000
#endif
static const QWinMessageMapping<uint> values[] = {
{ENDSESSION_CLOSEAPP, "Close application"},
{ENDSESSION_CRITICAL, "Force application end"},
@ -887,12 +893,6 @@ QString decodeMSG(const MSG& msg)
parameters += QLatin1Char(')');
}
break;
#ifndef ENDSESSION_CLOSEAPP
#define ENDSESSION_CLOSEAPP 0x00000001
#endif
#ifndef ENDSESSION_CRITICAL
#define ENDSESSION_CRITICAL 0x40000000
#endif
case WM_QUERYENDSESSION:
parameters = QLatin1String("End session: ");
if (const char *logoffOption = sessionMgrLogOffOption(uint(wParam)))