diff options
| author | Joerg Bornemann <joerg.bornemann@trolltech.com> | 2009-11-02 17:41:06 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-10 11:10:23 (GMT) |
| commit | f80c224ddd3c3c4a408c8f88e6cf5114ee107c89 (patch) | |
| tree | 15ba0fccc5700ceda254d4914169314f7e784461 /src/3rdparty/webkit | |
| parent | ee9b774ae230d3fce0f33510f421e8e772536c1d (diff) | |
| download | Qt-f80c224ddd3c3c4a408c8f88e6cf5114ee107c89.zip Qt-f80c224ddd3c3c4a408c8f88e6cf5114ee107c89.tar.gz Qt-f80c224ddd3c3c4a408c8f88e6cf5114ee107c89.tar.bz2 | |
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/3rdparty/webkit')
| -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) */ |