summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-10-26 08:58:36 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-10-26 08:58:36 (GMT)
commitdb3b330d85b7d28dbdc9dd3aabb7f345c60537b8 (patch)
treeceba098ac1286579cf116136418d6ad74fb75775
parentfdd934b4110ff7c9c5602153384eea9601bf6f7c (diff)
downloadQt-db3b330d85b7d28dbdc9dd3aabb7f345c60537b8.zip
Qt-db3b330d85b7d28dbdc9dd3aabb7f345c60537b8.tar.gz
Qt-db3b330d85b7d28dbdc9dd3aabb7f345c60537b8.tar.bz2
Compile on windows
-rw-r--r--src/script/api/qscriptprogram.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/script/api/qscriptprogram.cpp b/src/script/api/qscriptprogram.cpp
index 3ea4fa7..aff9817 100644
--- a/src/script/api/qscriptprogram.cpp
+++ b/src/script/api/qscriptprogram.cpp
@@ -39,6 +39,12 @@
**
****************************************************************************/
+#include <QtCore/qglobal.h>
+#ifdef Q_WS_WIN
+#define max max
+#define min min
+#endif
+
#include "qscriptprogram.h"
#include "qscriptprogram_p.h"
#include "qscriptengine.h"