diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-02-03 13:30:03 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-03 15:09:03 +0100 |
| commit | 5117f55063af0df665c5eeabba26f4312bf5381b (patch) | |
| tree | d7e4a33a0013f29fb6d241202567692ccc98c113 /src/corelib | |
| parent | 5bab4744bad247f3b93792f9ed4b578b0f780296 (diff) | |
Fix compilation on MinGW.
- Add missing constant.
- Make FontKey a pair instead of a function-local type which
cannot be used as template parameter for gcc.
- Fix warnings about redefinition of NOMINMAX and enumeration.
Change-Id: Ie3eb6e5b8dd9cd81210d6e10270ada0158aaf809
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qt_windows.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/global/qt_windows.h b/src/corelib/global/qt_windows.h index f9d2cf8413..e4af46d939 100644 --- a/src/corelib/global/qt_windows.h +++ b/src/corelib/global/qt_windows.h @@ -60,7 +60,9 @@ #endif #endif -#define NOMINMAX +#ifndef NOMINMAX +# define NOMINMAX +#endif #include <windows.h> #ifdef _WIN32_WCE |