diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-08-14 08:56:34 (GMT) |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-08-14 08:58:16 (GMT) |
commit | 302706307fabd45e6238f5795550541912a26c78 (patch) | |
tree | 804f56d9a43b51cd1d8c25840b45e4e8c8cd857a /src/script | |
parent | fac4b448ea58d0feea8de8b44641a5b89f4f40d3 (diff) | |
download | Qt-302706307fabd45e6238f5795550541912a26c78.zip Qt-302706307fabd45e6238f5795550541912a26c78.tar.gz Qt-302706307fabd45e6238f5795550541912a26c78.tar.bz2 |
Fix compilation on Windows
In WebKit/JSC config.h needs to be included first in .cpp files, to among
other things make sure that min/max are not defined as macros through
windows.h.
Diffstat (limited to 'src/script')
-rw-r--r-- | src/script/api/qscriptcontext.cpp | 1 | ||||
-rw-r--r-- | src/script/api/qscriptcontextinfo.cpp | 1 | ||||
-rw-r--r-- | src/script/api/qscriptengine.cpp | 1 | ||||
-rw-r--r-- | src/script/api/qscriptengineagent.cpp | 1 | ||||
-rw-r--r-- | src/script/api/qscriptstring.cpp | 1 | ||||
-rw-r--r-- | src/script/api/qscriptvalue.cpp | 1 | ||||
-rw-r--r-- | src/script/api/qscriptvalueiterator.cpp | 1 | ||||
-rw-r--r-- | src/script/bridge/qscriptactivationobject.cpp | 1 | ||||
-rw-r--r-- | src/script/bridge/qscriptclassobject.cpp | 1 | ||||
-rw-r--r-- | src/script/bridge/qscriptfunction.cpp | 1 | ||||
-rw-r--r-- | src/script/bridge/qscriptglobalobject.cpp | 1 | ||||
-rw-r--r-- | src/script/bridge/qscriptobject.cpp | 1 | ||||
-rw-r--r-- | src/script/bridge/qscriptqobject.cpp | 1 | ||||
-rw-r--r-- | src/script/bridge/qscriptvariant.cpp | 1 |
14 files changed, 14 insertions, 0 deletions
diff --git a/src/script/api/qscriptcontext.cpp b/src/script/api/qscriptcontext.cpp index 04337df..1b69ac1 100644 --- a/src/script/api/qscriptcontext.cpp +++ b/src/script/api/qscriptcontext.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ +#include "config.h" #include "qscriptcontext.h" #include "qscriptcontext_p.h" diff --git a/src/script/api/qscriptcontextinfo.cpp b/src/script/api/qscriptcontextinfo.cpp index 6c847c2..f8e4a54 100644 --- a/src/script/api/qscriptcontextinfo.cpp +++ b/src/script/api/qscriptcontextinfo.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ +#include "config.h" #include "qscriptcontextinfo.h" #include "qscriptcontext_p.h" diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index b4bcd22..a87872a 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ +#include "config.h" #include "qscriptengine.h" #include "qscriptsyntaxchecker_p.h" #include "qnumeric.h" diff --git a/src/script/api/qscriptengineagent.cpp b/src/script/api/qscriptengineagent.cpp index bab73de..d0a60cb 100644 --- a/src/script/api/qscriptengineagent.cpp +++ b/src/script/api/qscriptengineagent.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ +#include "config.h" #include "qscriptengineagent.h" #include "qscriptengineagent_p.h" diff --git a/src/script/api/qscriptstring.cpp b/src/script/api/qscriptstring.cpp index c96e4eb..0ded562 100644 --- a/src/script/api/qscriptstring.cpp +++ b/src/script/api/qscriptstring.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ +#include "config.h" #include "qscriptstring.h" #include "qscriptstring_p.h" diff --git a/src/script/api/qscriptvalue.cpp b/src/script/api/qscriptvalue.cpp index 4558097..3a8e544 100644 --- a/src/script/api/qscriptvalue.cpp +++ b/src/script/api/qscriptvalue.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ +#include "config.h" #include "qscriptvalue.h" #include "qscriptvalue_p.h" diff --git a/src/script/api/qscriptvalueiterator.cpp b/src/script/api/qscriptvalueiterator.cpp index 0e64c9d..984dea1 100644 --- a/src/script/api/qscriptvalueiterator.cpp +++ b/src/script/api/qscriptvalueiterator.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ +#include "config.h" #include "qscriptvalueiterator.h" #include "qscriptstring.h" diff --git a/src/script/bridge/qscriptactivationobject.cpp b/src/script/bridge/qscriptactivationobject.cpp index ee2fb88..ae466e8 100644 --- a/src/script/bridge/qscriptactivationobject.cpp +++ b/src/script/bridge/qscriptactivationobject.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ +#include "config.h" #include "qscriptactivationobject_p.h" #include "JSVariableObject.h" diff --git a/src/script/bridge/qscriptclassobject.cpp b/src/script/bridge/qscriptclassobject.cpp index 9b9af9e..504742a 100644 --- a/src/script/bridge/qscriptclassobject.cpp +++ b/src/script/bridge/qscriptclassobject.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ +#include "config.h" #include "qscriptclassobject_p.h" #include "../api/qscriptengine.h" diff --git a/src/script/bridge/qscriptfunction.cpp b/src/script/bridge/qscriptfunction.cpp index 08f0ca0..f485bd8 100644 --- a/src/script/bridge/qscriptfunction.cpp +++ b/src/script/bridge/qscriptfunction.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ +#include "config.h" #include "qscriptfunction_p.h" #include "private/qscriptengine_p.h" diff --git a/src/script/bridge/qscriptglobalobject.cpp b/src/script/bridge/qscriptglobalobject.cpp index 0344de1..5f374ed 100644 --- a/src/script/bridge/qscriptglobalobject.cpp +++ b/src/script/bridge/qscriptglobalobject.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ +#include "config.h" #include "qscriptglobalobject_p.h" #include "../api/qscriptengine.h" diff --git a/src/script/bridge/qscriptobject.cpp b/src/script/bridge/qscriptobject.cpp index 5edaecb..a8bd798 100644 --- a/src/script/bridge/qscriptobject.cpp +++ b/src/script/bridge/qscriptobject.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ +#include "config.h" #include "qscriptobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/script/bridge/qscriptqobject.cpp b/src/script/bridge/qscriptqobject.cpp index 0b3f4fd..a334367 100644 --- a/src/script/bridge/qscriptqobject.cpp +++ b/src/script/bridge/qscriptqobject.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ +#include "config.h" #include "qscriptqobject_p.h" #include <QtCore/qmetaobject.h> diff --git a/src/script/bridge/qscriptvariant.cpp b/src/script/bridge/qscriptvariant.cpp index 194d623..7bc1122 100644 --- a/src/script/bridge/qscriptvariant.cpp +++ b/src/script/bridge/qscriptvariant.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ +#include "config.h" #include "qscriptvariant_p.h" #include "../api/qscriptengine.h" |