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/bridge | |
| 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/bridge')
| -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 |
7 files changed, 7 insertions, 0 deletions
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" |