diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-02 13:12:51 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-02 13:12:51 (GMT) |
| commit | eeaf1b14b45714cf2d7e447806f0893367dc4f6a (patch) | |
| tree | 69d37edb0067bf60e2279ffe70cc88921a173c42 /src/corelib | |
| parent | 11d2c8f96697adc93ccd82e3db1de6ecde025eff (diff) | |
| parent | 57d33781bd8e02904a85de7fc54f8f4e8bd299e6 (diff) | |
| download | Qt-eeaf1b14b45714cf2d7e447806f0893367dc4f6a.zip Qt-eeaf1b14b45714cf2d7e447806f0893367dc4f6a.tar.gz Qt-eeaf1b14b45714cf2d7e447806f0893367dc4f6a.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-master-from-4.6
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/thread/qthread_win.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/thread/qthread_win.cpp b/src/corelib/thread/qthread_win.cpp index b276f0a..37d5b87 100644 --- a/src/corelib/thread/qthread_win.cpp +++ b/src/corelib/thread/qthread_win.cpp @@ -40,7 +40,9 @@ ****************************************************************************/ //#define WINVER 0x0500 +#if _WIN32_WINNT < 0x0400 #define _WIN32_WINNT 0x0400 +#endif #include "qthread.h" |