diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-08-14 08:57:25 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-08-14 08:58:17 (GMT) |
| commit | dc5dc7666dfc5758a86eca4afaefa7076d2d9f5b (patch) | |
| tree | 04450709db260447c33a979d8b6d8f63c7db4695 /src/script/bridge | |
| parent | 302706307fabd45e6238f5795550541912a26c78 (diff) | |
| download | Qt-dc5dc7666dfc5758a86eca4afaefa7076d2d9f5b.zip Qt-dc5dc7666dfc5758a86eca4afaefa7076d2d9f5b.tar.gz Qt-dc5dc7666dfc5758a86eca4afaefa7076d2d9f5b.tar.bz2 | |
Fix compilation on Windows
Don't compile moc_qscriptqobject_p.cpp separately but compile it from
qscriptqobject.cpp instead, to ensure that config.h is included. That
ensures that min/max are undeffed as macros.
Diffstat (limited to 'src/script/bridge')
| -rw-r--r-- | src/script/bridge/qscriptqobject.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/script/bridge/qscriptqobject.cpp b/src/script/bridge/qscriptqobject.cpp index a334367..695db9f 100644 --- a/src/script/bridge/qscriptqobject.cpp +++ b/src/script/bridge/qscriptqobject.cpp @@ -2220,3 +2220,6 @@ namespace JSC } QT_END_NAMESPACE + +#include "moc_qscriptqobject_p.cpp" + |