diff options
| author | Joerg Bornemann <joerg.bornemann@trolltech.com> | 2009-11-02 17:41:06 (GMT) |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2009-11-12 10:40:29 (GMT) |
| commit | 86a86f442a04de1abdc1b818580c0ca1baa6cd08 (patch) | |
| tree | ef542820451680ef6e25587a4389763b1ee73f32 /src | |
| parent | 02c19a26d881a67f94b680dab3de07c16017dd98 (diff) | |
| download | Qt-86a86f442a04de1abdc1b818580c0ca1baa6cd08.zip Qt-86a86f442a04de1abdc1b818580c0ca1baa6cd08.tar.gz Qt-86a86f442a04de1abdc1b818580c0ca1baa6cd08.tar.bz2 | |
Re-apply change f80c224ddd3c3c4a408c8f88e6cf5114ee107c89 by Joerg Bornemann
fix WebKit build on Windows CE 6
Again, we have fun with the C time functions on Windows CE.
On Windows CE 5: the functions are declared but not defined.
On Windows CE 6: the functions are neither declared nor defined.
Reviewed-by: Simon Hausmann
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri | 3 | ||||
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri index eb26664..8bd4225 100644 --- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri +++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri @@ -61,7 +61,8 @@ win32-* { } wince* { - SOURCES += $$QT_SOURCE_TREE/src/3rdparty/ce-compat/ce_time.cpp + INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/ce-compat + SOURCES += $$QT_SOURCE_TREE/src/3rdparty/ce-compat/ce_time.c DEFINES += WINCEBASIC } diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h index 7632435..ddc287f 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h @@ -372,6 +372,10 @@ # endif #endif +#if PLATFORM(WINCE) && PLATFORM(QT) +# include <ce_time.h> +#endif + /* Compiler */ /* COMPILER(MSVC) */ |