diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-03-26 09:02:31 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-03-26 09:02:31 (GMT) |
| commit | e7c8f5b6f2751fe3ebcecfdf26ff0dd6cbbb2512 (patch) | |
| tree | efc5ef88c45c28c61aadf632e830e3b06ef80ddc /src/3rdparty/javascriptcore/JavaScriptCore | |
| parent | 7b9fd32139d1e381f45a0655dafbfc98dc9aca39 (diff) | |
| parent | 3e5794f6a622414b0e7c01ffe00d664fead37c40 (diff) | |
| download | Qt-e7c8f5b6f2751fe3ebcecfdf26ff0dd6cbbb2512.zip Qt-e7c8f5b6f2751fe3ebcecfdf26ff0dd6cbbb2512.tar.gz Qt-e7c8f5b6f2751fe3ebcecfdf26ff0dd6cbbb2512.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/3rdparty/javascriptcore/JavaScriptCore')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/config.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/config.h b/src/3rdparty/javascriptcore/JavaScriptCore/config.h index d5fdfe9..2af2e71 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/config.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/config.h @@ -25,7 +25,7 @@ #include <wtf/Platform.h> -#if OS(WINDOWS) && !defined(BUILDING_WX__) && !COMPILER(GCC) +#if !defined(QT_BUILD_SCRIPT_LIB) && OS(WINDOWS) && !defined(BUILDING_WX__) && !COMPILER(GCC) #if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF) #define JS_EXPORTDATA __declspec(dllexport) #else |