diff options
| author | Titta Heikkala <titta.heikkala@digia.com> | 2013-11-14 11:52:17 +0200 |
|---|---|---|
| committer | Titta Heikkala <titta.heikkala@digia.com> | 2013-11-14 12:13:11 +0200 |
| commit | e7a36c62fc79c335b3a22a5e71ceb61f21215dbc (patch) | |
| tree | e1247370c8b93ea84c435e4cd351988492904891 | |
| parent | 73a89aea7a8b074d8aba52ff1d6868ab23a9d402 (diff) | |
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>
| -rw-r--r-- | src/qchartglobal.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qchartglobal.h b/src/qchartglobal.h index 2e28f956..b74d32ab 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 |