From aca3513dda6316817b04a132a1ab2a033c769f18 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Thu, 14 Jun 2012 22:31:38 +1000 Subject: [PATCH] Do not redefine NIN_KEYSELECT if already defined NIN_KEYSELECT is already defined for MinGW-w64. Change-Id: Ieab9f883cf1680f792d085e254916d51602ce701 Reviewed-by: Thiago Macieira --- src/widgets/util/qsystemtrayicon_win.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/widgets/util/qsystemtrayicon_win.cpp b/src/widgets/util/qsystemtrayicon_win.cpp index 84becf4a70..731b547e2a 100644 --- a/src/widgets/util/qsystemtrayicon_win.cpp +++ b/src/widgets/util/qsystemtrayicon_win.cpp @@ -75,9 +75,12 @@ struct Q_NOTIFYICONIDENTIFIER { GUID guidItem; }; +#ifndef NIN_KEYSELECT +# define NIN_KEYSELECT (WM_USER + 1) +#endif + #ifdef Q_CC_MINGW # define NIN_SELECT (WM_USER + 0) -# define NIN_KEYSELECT (WM_USER + 1) # define NIN_BALLOONTIMEOUT (WM_USER + 4) # define NIN_BALLOONUSERCLICK (WM_USER + 5) # define NIF_SHOWTIP 0x00000080