From 5117f55063af0df665c5eeabba26f4312bf5381b Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Fri, 3 Feb 2012 13:30:03 +0100
Subject: 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>
---
 src/corelib/global/qt_windows.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/corelib/global')

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
-- 
cgit v1.2.3