diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
| tree | e367e64a75991c554930278175d403c072de6bb8 /Source/JavaScriptCore/config.h | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
| download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz | |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/JavaScriptCore/config.h')
| -rw-r--r-- | Source/JavaScriptCore/config.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Source/JavaScriptCore/config.h b/Source/JavaScriptCore/config.h index 68ebc960d..4e1d2b91c 100644 --- a/Source/JavaScriptCore/config.h +++ b/Source/JavaScriptCore/config.h @@ -29,22 +29,18 @@ #include <wtf/Platform.h> #include <wtf/ExportMacros.h> -// WTF cannot depend on JSC even if USE(JSC). -#if USE(JSC) && !defined(BUILDING_WTF) +#if !defined(BUILDING_WTF) #include "JSExportMacros.h" -#elif PLATFORM(CHROMIUM) -// Chromium doesn't have runtime/ in its include paths. -#include "runtime/JSExportMacros.h" #endif #if OS(WINDOWS) #ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0500 +#define _WIN32_WINNT 0x0502 #endif #ifndef WINVER -#define WINVER 0x0500 +#define WINVER 0x0502 #endif // If we don't define these, they get defined in windef.h. |