diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-17 16:55:23 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-17 16:55:23 (GMT) |
| commit | 7136aee666e89a1a2b6ed7fc64dc7e4a48353d4d (patch) | |
| tree | 85e4e750bbd474385f2854161ab8eacb7bf79d89 | |
| parent | 6ed436a0bcbba1c04068c1dc48f7c74882bbf62e (diff) | |
| download | Qt-7136aee666e89a1a2b6ed7fc64dc7e4a48353d4d.zip Qt-7136aee666e89a1a2b6ed7fc64dc7e4a48353d4d.tar.gz Qt-7136aee666e89a1a2b6ed7fc64dc7e4a48353d4d.tar.bz2 | |
Build on Windows CE
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/wtf/Assertions.cpp | 5 | ||||
| -rw-r--r-- | src/script/script.pro | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/Assertions.cpp b/src/3rdparty/webkit/JavaScriptCore/wtf/Assertions.cpp index 819ed9a..54daf23 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/Assertions.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Assertions.cpp @@ -72,7 +72,10 @@ static void vprintf_stderr_common(const char* format, va_list args) CFRelease(cfFormat); } else #elif COMPILER(MSVC) && !defined(WINCEBASIC) - if (IsDebuggerPresent()) { +# if !defined(_WIN32_WCE) || (_WIN32_WCE >= 0x600) + if (IsDebuggerPresent()) +# endif + { size_t size = 1024; do { diff --git a/src/script/script.pro b/src/script/script.pro index c5d4647..9d4813e 100644 --- a/src/script/script.pro +++ b/src/script/script.pro @@ -29,6 +29,14 @@ isEmpty(WEBKITDIR) { include($$WEBKITDIR/WebKit.pri) } +# Windows CE-specific stuff copied from WebCore.pro +# ### Should rather be in JavaScriptCore.pri? +wince* { + INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/os-wince + INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/os-win32 + LIBS += -lmmtimer +} + include($$WEBKITDIR/JavaScriptCore/JavaScriptCore.pri) INCLUDEPATH += $$WEBKITDIR/JavaScriptCore |