diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-07-01 09:25:57 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-07-01 09:25:57 (GMT) |
| commit | 574fdf0b7e61c1c9994739035d9adb51af2629d0 (patch) | |
| tree | 6cf91585a63b26dce56f18a1ccd924cf7ec38cb9 /src/3rdparty/webkit/JavaScriptCore/API | |
| parent | a1d5b33bd33ecf1d809346a39d2386cafaf50cef (diff) | |
| parent | 9cb231d773db6deb8fb145eb40aa949a2758d002 (diff) | |
| download | Qt-574fdf0b7e61c1c9994739035d9adb51af2629d0.zip Qt-574fdf0b7e61c1c9994739035d9adb51af2629d0.tar.gz Qt-574fdf0b7e61c1c9994739035d9adb51af2629d0.tar.bz2 | |
Merge commit 'qt/master' into graphicssceneindex
Conflicts:
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/graphicsview/qgraphicsscene_p.h
src/gui/graphicsview/qgraphicsview.cpp
src/gui/graphicsview/qgraphicsview_p.h
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/API')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/API/JSBase.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/API/JSBase.h b/src/3rdparty/webkit/JavaScriptCore/API/JSBase.h index 6f012ca..9f3d88e 100644 --- a/src/3rdparty/webkit/JavaScriptCore/API/JSBase.h +++ b/src/3rdparty/webkit/JavaScriptCore/API/JSBase.h @@ -69,6 +69,14 @@ typedef struct OpaqueJSValue* JSObjectRef; #define JS_EXPORT #elif defined(__GNUC__) #define JS_EXPORT __attribute__((visibility("default"))) +#elif defined(_WIN32_WCE) + #if defined(JS_BUILDING_JS) + #define JS_EXPORT __declspec(dllexport) + #elif defined(JS_IMPORT_JS) + #define JS_EXPORT __declspec(dllimport) + #else + #define JS_EXPORT + #endif #elif defined(WIN32) || defined(_WIN32) /* * TODO: Export symbols with JS_EXPORT when using MSVC. |