diff options
| author | Jonathan Liu <net147@gmail.com> | 2012-06-14 22:31:38 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-15 16:13:01 +0200 |
| commit | aca3513dda6316817b04a132a1ab2a033c769f18 (patch) | |
| tree | e406123c6486ff150ee62090ac8b9ba32ff9876b /src/widgets | |
| parent | 007476ab19c8d85733533359c636e41a55d3e3b8 (diff) | |
Do not redefine NIN_KEYSELECT if already defined
NIN_KEYSELECT is already defined for MinGW-w64.
Change-Id: Ieab9f883cf1680f792d085e254916d51602ce701
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/util/qsystemtrayicon_win.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
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 |