From e7a36c62fc79c335b3a22a5e71ceb61f21215dbc 2013-11-14 10:13:11
From: Titta Heikkala <titta.heikkala@digia.com>
Date: 2013-11-14 10:13:11
Subject: [PATCH] Fix NOMINMAX definition

Only define the NOMINMAX if it's not yet defined.

Task-number: QTRD-2575
Change-Id: I99cca858031c39d9503fb7ae726d74802c52236a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

---

diff --git a/src/qchartglobal.h b/src/qchartglobal.h
index 2e28f95..b74d32a 100644
--- a/src/qchartglobal.h
+++ b/src/qchartglobal.h
@@ -89,7 +89,9 @@ static inline QDebug chartDebug(int numargs,...)
     On Windows min and max conflict with standard macros
 */
 #ifdef Q_OS_WIN
+#ifndef NOMINMAX
 #define NOMINMAX
 #endif
+#endif
 
 #endif // QCHARTGLOBAL_H