diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-30 15:38:25 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-30 15:38:25 +0200 |
| commit | 7c613a9ef4610fa2e0e1630eb3cd2b474875631d (patch) | |
| tree | 757be578070f7cb7c724476e7b6980ee5ad215a4 /src/gui/text/qfontengine_win.cpp | |
| parent | 39f88fc60ad6ce323000a10b2925ad7dbb1544c2 (diff) | |
| parent | c45ce66ce417718e09de276bfdb663aa5e9fe366 (diff) | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
Diffstat (limited to 'src/gui/text/qfontengine_win.cpp')
| -rw-r--r-- | src/gui/text/qfontengine_win.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/text/qfontengine_win.cpp b/src/gui/text/qfontengine_win.cpp index 3e79d79b95..93a7c7585a 100644 --- a/src/gui/text/qfontengine_win.cpp +++ b/src/gui/text/qfontengine_win.cpp @@ -39,6 +39,11 @@ ** ****************************************************************************/ +#if _WIN32_WINNT < 0x0500 +#undef _WIN32_WINNT +#define _WIN32_WINNT 0x0500 +#endif + #include "qfontengine_p.h" #include "qtextengine_p.h" #include <qglobal.h> |