Fix compile error caused by min/max defines.

qtbase d0804ff2dd3d289a0f0c58aa30c4334e66ea9be0 introduces a check
for min/max which causes a compile error.

Change-Id: I6a79e75423baa3f577eb26697e2766e58040b7d9
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>

src/3rdparty/javascriptcore/JavaScriptCore/config.h

@@ -39,10 +39,10 @@
 
 #if OS(WINDOWS)
 
-// If we don't define these, they get defined in windef.h. 
-// We want to use std::min and std::max
-#define max max
-#define min min
+// windef.h defines min and max unless NOMINMAX is defined.
+#ifndef NOMINMAX
+#  define NOMINMAX
+#endif
 
 #if !COMPILER(MSVC7) && !OS(WINCE)
 // We need to define this before the first #include of stdlib.h or it won't contain rand_s.