diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2012-10-27 14:52:42 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-29 18:22:29 +0100 |
| commit | 63e451194e9f736fe4e35abd6a2a68c507ec9f5f (patch) | |
| tree | 918c867d9ad5a6864f3f60d8b8deb035230c5457 /src/widgets/util/qsystemtrayicon_win.cpp | |
| parent | 2eefa819c4350a09994221f20168fc00be1d0910 (diff) | |
Fix build on MinGW after 0f14ea3f3a05ef785b44fa610bf90ff3b5ba7beb
Also generalize set _WIN32_WINNT to 0x0501 and _WIN32_IE to 0x0501 globally,
as it is out minimal requirement these days.
Change-Id: I8ca9102d49c37f908fd8ac032f707f8fe4fdcb22
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/widgets/util/qsystemtrayicon_win.cpp')
| -rw-r--r-- | src/widgets/util/qsystemtrayicon_win.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/widgets/util/qsystemtrayicon_win.cpp b/src/widgets/util/qsystemtrayicon_win.cpp index 108e65a2d1..896d5c2213 100644 --- a/src/widgets/util/qsystemtrayicon_win.cpp +++ b/src/widgets/util/qsystemtrayicon_win.cpp @@ -42,12 +42,18 @@ #include "qsystemtrayicon_p.h" #ifndef QT_NO_SYSTEMTRAYICON -#ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0600 +#if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0600 +# undef _WIN32_WINNT +#endif +#if !defined(_WIN32_WINNT) +# define _WIN32_WINNT 0x0600 #endif -#ifndef _WIN32_IE -#define _WIN32_IE 0x600 +#if defined(_WIN32_IE) && _WIN32_IE < 0x0600 +# undef _WIN32_IE +#endif +#if !defined(_WIN32_IE) +# define _WIN32_IE 0x0600 //required for NOTIFYICONDATA_V2_SIZE #endif #include <private/qsystemlibrary_p.h> |