diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-02 17:29:18 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-02 17:29:18 (GMT) |
| commit | e0a50a627376a7b83a2e965dee75515ed283a447 (patch) | |
| tree | 18299db50b8df7af97dfde4c94ecfd89151f445f /src/corelib | |
| parent | 8abab5f61eb95192b7e3dcafab1980b35fd167bb (diff) | |
| parent | abcd951f373011a66dd2d53c7280ff2b369a72fd (diff) | |
| download | Qt-e0a50a627376a7b83a2e965dee75515ed283a447.zip Qt-e0a50a627376a7b83a2e965dee75515ed283a447.tar.gz Qt-e0a50a627376a7b83a2e965dee75515ed283a447.tar.bz2 | |
Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
Fixed maketestselftest failure with some MSVC versions.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( afc4c208fe296f5a1dd0e73f2bd1273bd22d9b24 )
Fix a problem with overlay icons in the fileiconprovider
Only set the _WIN32_WINNT define if it is not set or less than 0x0400
QPrintDialog::setPrinter(), QPrintDialog::printer(), QPrintDialog::addButton should be documented as QT3 support member
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( ca7b2e1e1ca558050cf49dd8f7c9b35e4b9d4df5 )
Fix autotest memory leak
Carbon: crash problem in QWidgetPrivate::hide_sys, v2
Carbon: crash problem in QWidgetPrivate::hide_sys
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" |